test_shell: Also test shell_plus

Author: tony

tests/test_cli.py

@@ -406,24 +406,18 @@ def test_load_zsh_autotitle_warning(cli_args, tmpdir, monkeypatch):
         assert 'Please set' not in result.output
 
 
+@pytest.mark.parametrize("cli_cmd", ['shell', 'shell_plus'])
 @pytest.mark.parametrize(
     "cli_args,inputs,env,expected_output",
     [
         (
-            ['shell_plus', '-L{SOCKET_NAME}', '-c', 'print(str(server.socket_name))'],
-            [],
-            {},
-            '{SERVER_SOCKET_NAME}',
-        ),
-        (
-            ['shell', '-L{SOCKET_NAME}', '-c', 'print(str(server.socket_name))'],
+            ['-L{SOCKET_NAME}', '-c', 'print(str(server.socket_name))'],
             [],
             {},
             '{SERVER_SOCKET_NAME}',
         ),
         (
             [
-                'shell',
                 '-L{SOCKET_NAME}',
                 '{SESSION_NAME}',
                 '-c',
@@ -435,7 +429,6 @@ def test_load_zsh_autotitle_warning(cli_args, tmpdir, monkeypatch):
         ),
         (
             [
-                'shell',
                 '-L{SOCKET_NAME}',
                 '{SESSION_NAME}',
                 '{WINDOW_NAME}',
@@ -448,7 +441,6 @@ def test_load_zsh_autotitle_warning(cli_args, tmpdir, monkeypatch):
         ),
         (
             [
-                'shell',
                 '-L{SOCKET_NAME}',
                 '{SESSION_NAME}',
                 '{WINDOW_NAME}',
@@ -461,7 +453,6 @@ def test_load_zsh_autotitle_warning(cli_args, tmpdir, monkeypatch):
         ),
         (
             [
-                'shell',
                 '-L{SOCKET_NAME}',
                 '{SESSION_NAME}',
                 '{WINDOW_NAME}',
@@ -474,7 +465,6 @@ def test_load_zsh_autotitle_warning(cli_args, tmpdir, monkeypatch):
         ),
         (
             [
-                'shell',
                 '-L{SOCKET_NAME}',
                 '-c',
                 'print(pane.id)',
@@ -486,7 +476,15 @@ def test_load_zsh_autotitle_warning(cli_args, tmpdir, monkeypatch):
     ],
 )
 def test_shell(
-    cli_args, inputs, expected_output, env, tmpdir, monkeypatch, server, session
+    cli_cmd,
+    cli_args,
+    inputs,
+    expected_output,
+    env,
+    tmpdir,
+    monkeypatch,
+    server,
+    session,
 ):
     monkeypatch.setenv('HOME', str(tmpdir))
     window_name = 'my_window'
@@ -502,7 +500,8 @@ def test_shell(
         SERVER_SOCKET_NAME=server.socket_name,
     )
 
-    cli_args[:] = [cli_arg.format(**template_ctx) for cli_arg in cli_args]
+    cli_args = [cli_cmd] + [cli_arg.format(**template_ctx) for cli_arg in cli_args]
+
     for k, v in env.items():
         monkeypatch.setenv(k, v.format(**template_ctx))