Skip to content

Commit 10838bd

Browse files
committed
Ensure that all views are closed after running tests.
1 parent f0e3a5c commit 10838bd

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

tests/rust_test_common.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,9 @@ def async_test_view():
136136
if msg:
137137
raise msg
138138
finally:
139-
window.focus_view(view)
140-
window.run_command('close_file')
139+
if view.window():
140+
window.focus_view(view)
141+
window.run_command('close_file')
141142

142143
def _cargo_clean(self, view_or_path):
143144
if isinstance(view_or_path, sublime.View):

tests/test_message_order.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ def _test_message_order(self, view, messages, inline, command):
6666
window = view.window()
6767
self._run_build_wait(command)
6868

69+
to_close = []
70+
6971
def check_sequence(direction):
7072
omsgs = messages if direction == 'next' else reversed(messages)
7173
levels = ('all', 'error', 'warning') if inline else ('all',)
@@ -86,6 +88,7 @@ def check_sequence(direction):
8688
# moment to update.
8789
time.sleep(0.1)
8890
next_view = window.active_view()
91+
to_close.append(next_view)
8992
self.assertEqual(next_view.file_name(), next_filename)
9093
region = next_view.sel()[0]
9194
rowcol = next_view.rowcol(region.begin())
@@ -112,6 +115,11 @@ def check_sequence(direction):
112115
self._run_build_wait(command)
113116
check_sequence('prev')
114117

118+
for close_view in to_close:
119+
if close_view.window():
120+
window.focus_view(close_view)
121+
window.run_command('close_file')
122+
115123
def _collect_message_order(self, paths):
116124
"""Scan test files for comments that indicate the order of messages.
117125

0 commit comments

Comments
 (0)