Skip to content
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.

Sign up for GitHub

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

Jump to bottom

TUR-21619: Patch pytest error #3

Merged
merged 2 commits into from
Sep 17, 2024
Merged

TUR-21619: Patch pytest error #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
511ee4d
fix pytest error
ciaconet Sep 17, 2024
b851925
clearer if
ciaconet Sep 17, 2024
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
15 changes: 9 additions & 6 deletions src/xdist/dsession.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,14 +402,17 @@ def worker_collectionfinish(
self.terminal.write_line("")
if self.config.option.verbose > 0:
self.report_line(f"[-] [dse] scheduling tests via {self.sched.__class__.__name__}")
if isinstance(self.sched, CustomGroup) and self.ready_to_run_tests and self.are_all_active_nodes_collected():
# we're coming back here after finishing a batch of tests - so start the next batch
self.reschedule()
self.reset_nodes_if_needed()
if isinstance(self.sched, CustomGroup):
if self.ready_to_run_tests and self.are_all_active_nodes_collected():
# we're coming back here after finishing a batch of tests - so start the next batch
self.reschedule()
self.reset_nodes_if_needed()
else:
self.ready_to_run_tests = True
self.sched.schedule()
self.reset_nodes_if_needed()
else:
self.ready_to_run_tests = True
self.sched.schedule()
self.reset_nodes_if_needed()

def worker_logstart(
self,
Expand Down