tmuxp shell: Catch when servers not created

Author: tony

tests/test_cli.py

@@ -12,6 +12,7 @@
 
 import libtmux
 from libtmux.common import has_lt_version
+from libtmux.exc import LibTmuxException
 from tmuxp import cli, config
 from tmuxp.cli import (
     command_ls,
@@ -509,6 +510,39 @@ def test_shell(
         assert expected_output.format(**template_ctx) in result.output
 
 
+@pytest.mark.parametrize(
+    "cli_args,inputs,env,exception, message",
+    [
+        (
+            ['shell', '-L{SOCKET_NAME}', '-c', 'print(str(server.socket_name))'],
+            [],
+            {},
+            LibTmuxException,
+            r'.*{SOCKET_NAME}\s\(No such file or directory\).*',
+        ),
+    ],
+)
+def test_shell_no_server(
+    cli_args, inputs, env, exception, message, tmpdir, monkeypatch, socket_name
+):
+    monkeypatch.setenv('HOME', str(tmpdir))
+    template_ctx = dict(
+        SOCKET_NAME=socket_name,
+    )
+
+    cli_args[:] = [cli_arg.format(**template_ctx) for cli_arg in cli_args]
+    for k, v in env.items():
+        monkeypatch.setenv(k, v.format(**template_ctx))
+
+    with tmpdir.as_cwd():
+        runner = CliRunner()
+
+        with pytest.raises(exception, match=message.format(**template_ctx)):
+            runner.invoke(
+                cli.cli, cli_args, input=''.join(inputs), catch_exceptions=False
+            )
+
+
 @pytest.mark.parametrize(
     "cli_args",
     [

tmuxp/cli.py

@@ -16,12 +16,12 @@
 from click.exceptions import FileError
 
 from libtmux.common import has_gte_version, has_minimum_version, which
-from libtmux.exc import TmuxCommandNotFound
+from libtmux.exc import LibTmuxException, TmuxCommandNotFound
 from libtmux.server import Server
 
 from . import config, exc, log, util
 from .__about__ import __version__
-from ._compat import string_types
+from ._compat import reraise, string_types
 from .workspacebuilder import WorkspaceBuilder, freeze
 
 logger = logging.getLogger(__name__)
@@ -682,6 +682,17 @@ def command_shell(session_name, window_name, socket_name, socket_path, command):
     """
     server = Server(socket_name=socket_name, socket_path=socket_path)
 
+    try:
+        server.sessions
+    except LibTmuxException as e:
+        if 'No such file or directory' in str(e):
+            raise LibTmuxException(
+                'no tmux session found. Start a tmux session and try again. \n'
+                'Original error: ' + str(e)
+            )
+        else:
+            raise e
+
     current_pane = None
     if os.getenv('TMUX_PANE') is not None:
         try: