Skip to content

Commit 22f3343

Browse files
committed
feat: improve schedular default behaviour
1 parent ee9dde3 commit 22f3343

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

tests/test_all.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def run():
6767
parser.add_argument(
6868
"--max-nodes",
6969
dest="max_nodes",
70-
default=24,
70+
default=0,
7171
type=int,
7272
)
7373
parser.add_argument(
@@ -96,6 +96,10 @@ def run():
9696
"../target/release/conflux"),
9797
type=str)
9898
options = parser.parse_args()
99+
100+
if options.max_nodes == 0:
101+
options.max_nodes = os.cpu_count()
102+
print(f"Max nodes not specified, using {options.max_nodes} nodes")
99103

100104
all_failed = set()
101105

tests/test_utils/test_scheduler.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ def _prepare_task_queue(self, test_scripts):
6868
# Collect completed task results and add them to the queue
6969
for future, i, script in tasks:
7070
result = future.result()
71+
if result > self.available_nodes:
72+
raise RuntimeError(f"Cannot run {script} because it requires {result} nodes, "
73+
f"but only max to {self.available_nodes} nodes are available"
74+
f"Please specify --max-nodes to run the test")
75+
7176
task_queue.put((script, result, i))
7277
print(" Done")
7378
return task_queue

0 commit comments

Comments
 (0)