Skip to content

Commit f3c9f89

Browse files
Merge pull request #4 from fgvieira/ret_set
fix: scheduler test set()
2 parents 5ae4a3f + d43a7ad commit f3c9f89

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

.github/workflows/release-please.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
with:
1717
release-type: python
1818
package-name: snakemake-interface-scheduler-plugins
19+
token: ${{ secrets.RELEASE_PLEASE_PR_CI_TOKEN }}
1920

2021
publish:
2122
runs-on: ubuntu-latest
@@ -35,4 +36,4 @@ jobs:
3536
uses: pypa/gh-action-pypi-publish@release/v1
3637
with:
3738
user: __token__
38-
password: ${{ secrets.PYPI_TOKEN }}
39+
password: ${{ secrets.PYPI_TOKEN }}

src/snakemake_interface_scheduler_plugins/tests.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,18 @@ def __init__(self) -> None:
7272
output=[AnnotatedString("output3.txt")],
7373
resources={"cpu": 1, "mem_mb": 1024},
7474
),
75+
DummyJob(
76+
input=[AnnotatedString("output1.txt")],
77+
output=[AnnotatedString("output4.txt")],
78+
resources={"cpu": 1, "mem_mb": 10024},
79+
),
7580
]
7681
self._dependencies: Mapping[
7782
SingleJobSchedulerInterface, List[SingleJobSchedulerInterface]
7883
] = {
7984
self._jobs[1]: [self._jobs[0]],
8085
self._jobs[2]: [self._jobs[0]],
86+
self._jobs[3]: [self._jobs[0]],
8187
}
8288
self._finished = set()
8389

@@ -143,11 +149,11 @@ def test_scheduler(self):
143149
dag._finished.add(dag._jobs[0])
144150

145151
scheduled = scheduler.select_jobs(
146-
[dag._jobs[1], dag._jobs[2]],
152+
[dag._jobs[1], dag._jobs[2], dag._jobs[3]],
147153
dag._jobs,
148154
available_resources={"cpu": 5, "mem_mb": 10000},
149155
input_sizes=defaultdict(int),
150156
)
151-
assert scheduled == [dag._jobs[1], dag._jobs[2]], (
157+
assert set(scheduled) == set([dag._jobs[1], dag._jobs[2]]), (
152158
"Scheduler did not select the expected jobs"
153159
)

0 commit comments

Comments
 (0)