Skip to content

fix(Server.session_name): Handle empty session names better #401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion libtmux/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,20 @@ def new_session(
Raises
------
:exc:`exc.BadSessionName`

Examples
--------
Sessions can be created without a session name (0.14.2+):
>>> server.new_session()
Session($2 2)

Creating them in succession will enumerate IDs (via tmux):
>>> server.new_session()
Session($3 3)

With a `session_name`:
>>> server.new_session(session_name='my session')
Session($4 my session)
"""
if session_name is not None:
session_check_name(session_name)
Expand All @@ -558,11 +572,13 @@ def new_session(
del os.environ["TMUX"]

tmux_args: t.Tuple[t.Union[str, int], ...] = (
"-s%s" % session_name,
"-P",
"-F%s" % formats.FORMAT_SEPARATOR.join(tmux_formats), # output
)

if session_name is not None:
tmux_args += (f"-s{session_name}",)

if not attach:
tmux_args += ("-d",)

Expand Down
17 changes: 13 additions & 4 deletions tests/test_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,19 @@ def test_new_session(server: Server) -> None:

def test_new_session_no_name(server: Server) -> None:
"""Server.new_session works with no name"""
mysession = server.new_session()
session_name = mysession.get("session_name")
assert session_name is not None
assert server.has_session(session_name)
first_session = server.new_session()
first_session_name = first_session.get("session_name")
assert first_session_name is not None
assert server.has_session(first_session_name)

expected_session_name = str(int(first_session_name) + 1)

# When a new session is created, it should enumerate
second_session = server.new_session()
second_session_name = second_session.get("session_name")
assert expected_session_name == second_session_name
assert second_session_name is not None
assert server.has_session(second_session_name)


def test_new_session_shell(server: Server) -> None:
Expand Down