update from last round
This commit is contained in:
+5
-5
@@ -90,7 +90,7 @@ class TestDemoRota:
|
||||
|
||||
self.Rota.export_rota_to_html("nwd")
|
||||
|
||||
assert self.Rota.results.solver.status == "warning"
|
||||
assert self.Rota.results.solver.status in ("warning", "error")
|
||||
|
||||
def test_nwd_partial_rota(self):
|
||||
# Set up rota
|
||||
@@ -188,7 +188,7 @@ class TestDemoRota:
|
||||
|
||||
self.Rota.build_and_solve(options={"ratio": 0.00})
|
||||
|
||||
assert self.Rota.results.solver.status == "warning"
|
||||
assert self.Rota.results.solver.status in ("warning", "error")
|
||||
|
||||
def test_nwd_force_as_block(self):
|
||||
# Set up rota
|
||||
@@ -273,21 +273,21 @@ class TestDemoRota:
|
||||
self.Rota.add_shifts(
|
||||
SingleShift(
|
||||
sites=("group1",), name="d", length= 12.5, days=days[:5],
|
||||
balance_offset=10,
|
||||
#balance_offset=50,
|
||||
workers_required=2,
|
||||
force_as_block_unless_nwd=True,
|
||||
assign_as_block=True,
|
||||
),
|
||||
SingleShift(
|
||||
sites=("group1",), name="w", length= 12.5, days=days[5:],
|
||||
balance_offset=10,
|
||||
#balance_offset=50,
|
||||
workers_required=4,
|
||||
force_as_block_unless_nwd=True,
|
||||
assign_as_block=True,
|
||||
),
|
||||
)
|
||||
|
||||
self.Rota.build_and_solve(options={"ratio": 0.00})
|
||||
self.Rota.build_and_solve()
|
||||
self.Rota.export_rota_to_html("nwd_block_force_split")
|
||||
|
||||
assert self.Rota.results.solver.status == "ok"
|
||||
|
||||
Reference in New Issue
Block a user