Skip to content

Commit 8cf07a0

Browse files
fix tests forcing append on build as param
1 parent 604e3b3 commit 8cf07a0

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

tests/test_workspacebuilder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ def test_load_configs_same_session(server):
692692
sconfig = sconfig.import_config(yaml_config).get()
693693

694694
builder = WorkspaceBuilder(sconf=sconfig, server=server)
695-
builder.build(server.sessions[0])
695+
builder.build(server.sessions[0], True)
696696

697697
assert len(server.sessions) == 1
698698
assert len(server.sessions[0]._windows) == 5

tmuxp/cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ def load_append_windows_same_session(builder):
587587
Load configs in the active session appending windows
588588
"""
589589
current_attached_sesssion = builder.find_current_attached_session()
590-
builder.build(current_attached_sesssion)
590+
builder.build(current_attached_sesssion, True)
591591
if has_gte_version('2.6'): # prepare for both cases
592592
set_layout_hook(builder.session, 'client-attached')
593593
set_layout_hook(builder.session, 'client-session-changed')

tmuxp/workspacebuilder.py

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def __init__(self, sconf, server=None):
9898

9999
self.sconf = sconf
100100

101-
def build(self, session=None):
101+
def build(self, session=None, append=False):
102102
"""
103103
Build tmux workspace in session.
104104
@@ -112,9 +112,10 @@ def build(self, session=None):
112112
----------
113113
session : :class:`libtmux.Session`
114114
session to build workspace in
115+
append : bool
116+
append windows in current active session
115117
"""
116118

117-
self.previous_session = False
118119
if not session:
119120
if not self.server:
120121
raise exc.TmuxpException(
@@ -136,8 +137,6 @@ def build(self, session=None):
136137

137138
assert self.sconf['session_name'] == session.name
138139
assert len(self.sconf['session_name']) > 0
139-
else:
140-
self.previous_session = True
141140

142141
self.session = session
143142
self.server = session.server
@@ -172,8 +171,7 @@ def build(self, session=None):
172171
for option, value in self.sconf['environment'].items():
173172
self.session.set_environment(option, value)
174173

175-
append_windows = self.append_windows_same_session()
176-
for w, wconf in self.iter_create_windows(session, append_windows):
174+
for w, wconf in self.iter_create_windows(session, append):
177175
assert isinstance(w, Window)
178176

179177
focus_pane = None
@@ -360,9 +358,6 @@ def find_current_attached_session(self):
360358
def first_window_pass(self, i, session, append_same_sassion):
361359
return len(session.windows) == 1 and i == 1 and not append_same_sassion
362360

363-
def append_windows_same_session(self):
364-
return self.previous_session
365-
366361

367362
def freeze(session):
368363
"""

0 commit comments

Comments
 (0)