perf(scheduler): sort scopes by number of tests to start with biggest…

… scope first
pytest-dev · Feb 24, 2021 · b131e41 · b131e41
1 parent 1189ae4
commit b131e41
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/changelog/632.feature.rst b/changelog/632.feature.rst
@@ -0,0 +1 @@
+LoadScope scheduler: Sort scopes by number of tests to assign biggest scopes first.
diff --git a/src/xdist/scheduler/loadscope.py b/src/xdist/scheduler/loadscope.py
@@ -349,11 +349,18 @@ def schedule(self):
             return
 
         # Determine chunks of work (scopes)
+        unsorted_workqueue = OrderedDict()
         for nodeid in self.collection:
             scope = self._split_scope(nodeid)
-            work_unit = self.workqueue.setdefault(scope, default=OrderedDict())
+            work_unit = unsorted_workqueue.setdefault(scope, default=OrderedDict())
             work_unit[nodeid] = False
 
+        # Insert tests scopes into work queue ordered by number of tests
+        for scope, nodeids in sorted(
+            unsorted_workqueue.items(), key=lambda item: -len(item[1])
+        ):
+            self.workqueue[scope] = nodeids
+
         # Avoid having more workers than work
         extra_nodes = len(self.nodes) - len(self.workqueue)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		LoadScope scheduler: Sort scopes by number of tests to assign biggest scopes first.