Skip to content

Commit 8ca0bf3

Browse files
author
Andrei Neagu
committed
fixed tests
1 parent 1ed132b commit 8ca0bf3

File tree

2 files changed

+32
-33
lines changed

2 files changed

+32
-33
lines changed

‎services/dynamic-scheduler/tests/unit/services/generic_scheduler/test__core.py‎

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -695,9 +695,9 @@ async def test_create_undo_order(
695695
{
696696
"SCH:{schedule_id}",
697697
"SCH:{schedule_id}:GROUPS:test_op:0S:C",
698-
"SCH:{schedule_id}:GROUPS:test_op:0S:R",
698+
"SCH:{schedule_id}:GROUPS:test_op:0S:U",
699699
"SCH:{schedule_id}:STEPS:test_op:0S:C:_FCR1",
700-
"SCH:{schedule_id}:STEPS:test_op:0S:R:_FCR1",
700+
"SCH:{schedule_id}:STEPS:test_op:0S:U:_FCR1",
701701
},
702702
id="s1(1rf)",
703703
),
@@ -714,10 +714,10 @@ async def test_create_undo_order(
714714
"SCH:{schedule_id}",
715715
"SCH:{schedule_id}:GROUPS:test_op:0S:C",
716716
"SCH:{schedule_id}:GROUPS:test_op:1S:C",
717-
"SCH:{schedule_id}:GROUPS:test_op:1S:R",
717+
"SCH:{schedule_id}:GROUPS:test_op:1S:U",
718718
"SCH:{schedule_id}:STEPS:test_op:0S:C:_S1",
719719
"SCH:{schedule_id}:STEPS:test_op:1S:C:_FCR1",
720-
"SCH:{schedule_id}:STEPS:test_op:1S:R:_FCR1",
720+
"SCH:{schedule_id}:STEPS:test_op:1S:U:_FCR1",
721721
},
722722
id="s2(1rf)",
723723
),
@@ -735,14 +735,14 @@ async def test_create_undo_order(
735735
"SCH:{schedule_id}",
736736
"SCH:{schedule_id}:GROUPS:test_op:0S:C",
737737
"SCH:{schedule_id}:GROUPS:test_op:1P:C",
738-
"SCH:{schedule_id}:GROUPS:test_op:1P:R",
738+
"SCH:{schedule_id}:GROUPS:test_op:1P:U",
739739
"SCH:{schedule_id}:STEPS:test_op:0S:C:_S1",
740740
"SCH:{schedule_id}:STEPS:test_op:1P:C:_FCR1",
741741
"SCH:{schedule_id}:STEPS:test_op:1P:C:_S2",
742742
"SCH:{schedule_id}:STEPS:test_op:1P:C:_S3",
743-
"SCH:{schedule_id}:STEPS:test_op:1P:R:_FCR1",
744-
"SCH:{schedule_id}:STEPS:test_op:1P:R:_S2",
745-
"SCH:{schedule_id}:STEPS:test_op:1P:R:_S3",
743+
"SCH:{schedule_id}:STEPS:test_op:1P:U:_FCR1",
744+
"SCH:{schedule_id}:STEPS:test_op:1P:U:_S2",
745+
"SCH:{schedule_id}:STEPS:test_op:1P:U:_S3",
746746
},
747747
id="s1p3(1rf)",
748748
),
@@ -760,16 +760,16 @@ async def test_create_undo_order(
760760
"SCH:{schedule_id}",
761761
"SCH:{schedule_id}:GROUPS:test_op:0S:C",
762762
"SCH:{schedule_id}:GROUPS:test_op:1P:C",
763-
"SCH:{schedule_id}:GROUPS:test_op:1P:R",
763+
"SCH:{schedule_id}:GROUPS:test_op:1P:U",
764764
"SCH:{schedule_id}:STEPS:test_op:0S:C:_S1",
765765
"SCH:{schedule_id}:STEPS:test_op:1P:C:_FCR1",
766766
"SCH:{schedule_id}:STEPS:test_op:1P:C:_FCR2",
767767
"SCH:{schedule_id}:STEPS:test_op:1P:C:_S2",
768768
"SCH:{schedule_id}:STEPS:test_op:1P:C:_S3",
769-
"SCH:{schedule_id}:STEPS:test_op:1P:R:_FCR1",
770-
"SCH:{schedule_id}:STEPS:test_op:1P:R:_FCR2",
771-
"SCH:{schedule_id}:STEPS:test_op:1P:R:_S2",
772-
"SCH:{schedule_id}:STEPS:test_op:1P:R:_S3",
769+
"SCH:{schedule_id}:STEPS:test_op:1P:U:_FCR1",
770+
"SCH:{schedule_id}:STEPS:test_op:1P:U:_FCR2",
771+
"SCH:{schedule_id}:STEPS:test_op:1P:U:_S2",
772+
"SCH:{schedule_id}:STEPS:test_op:1P:U:_S3",
773773
},
774774
id="s1p4(2rf)",
775775
),
@@ -1073,8 +1073,7 @@ async def test_wait_for_manual_intervention(
10731073
# even if cancelled, state of waiting for manual intervention remains the same
10741074
with pytest.raises(CannotCancelWhileWaitingForManualInterventionError):
10751075
await cancel_operation(selected_app, schedule_id)
1076-
# give some time for a "possible cancellation" to be processed
1077-
await asyncio.sleep(0.1)
1076+
10781077
await _ensure_keys_in_store(selected_app, expected_keys=formatted_expected_keys)
10791078

10801079
# set step to no longer raise and restart the failed steps
@@ -1120,13 +1119,13 @@ async def test_wait_for_manual_intervention(
11201119
"SCH:{schedule_id}:GROUPS:test_op:0S:C",
11211120
"SCH:{schedule_id}:GROUPS:test_op:1P:C",
11221121
"SCH:{schedule_id}:GROUPS:test_op:2S:C",
1123-
"SCH:{schedule_id}:GROUPS:test_op:2S:R",
1122+
"SCH:{schedule_id}:GROUPS:test_op:2S:U",
11241123
"SCH:{schedule_id}:STEPS:test_op:0S:C:_S1",
11251124
"SCH:{schedule_id}:STEPS:test_op:1P:C:_S2",
11261125
"SCH:{schedule_id}:STEPS:test_op:1P:C:_S3",
11271126
"SCH:{schedule_id}:STEPS:test_op:1P:C:_S4",
11281127
"SCH:{schedule_id}:STEPS:test_op:2S:C:_FCR1",
1129-
"SCH:{schedule_id}:STEPS:test_op:2S:R:_FCR1",
1128+
"SCH:{schedule_id}:STEPS:test_op:2S:U:_FCR1",
11301129
},
11311130
[
11321131
CreateSequence(_S1),
@@ -1159,7 +1158,7 @@ async def test_wait_for_manual_intervention(
11591158
"SCH:{schedule_id}:GROUPS:test_op:0S:C",
11601159
"SCH:{schedule_id}:GROUPS:test_op:1P:C",
11611160
"SCH:{schedule_id}:GROUPS:test_op:2P:C",
1162-
"SCH:{schedule_id}:GROUPS:test_op:2P:R",
1161+
"SCH:{schedule_id}:GROUPS:test_op:2P:U",
11631162
"SCH:{schedule_id}:STEPS:test_op:0S:C:_S1",
11641163
"SCH:{schedule_id}:STEPS:test_op:1P:C:_S2",
11651164
"SCH:{schedule_id}:STEPS:test_op:1P:C:_S3",
@@ -1170,12 +1169,12 @@ async def test_wait_for_manual_intervention(
11701169
"SCH:{schedule_id}:STEPS:test_op:2P:C:_FCR1",
11711170
"SCH:{schedule_id}:STEPS:test_op:2P:C:_FCR2",
11721171
"SCH:{schedule_id}:STEPS:test_op:2P:C:_FCR3",
1173-
"SCH:{schedule_id}:STEPS:test_op:2P:R:_S5",
1174-
"SCH:{schedule_id}:STEPS:test_op:2P:R:_S6",
1175-
"SCH:{schedule_id}:STEPS:test_op:2P:R:_S7",
1176-
"SCH:{schedule_id}:STEPS:test_op:2P:R:_FCR1",
1177-
"SCH:{schedule_id}:STEPS:test_op:2P:R:_FCR2",
1178-
"SCH:{schedule_id}:STEPS:test_op:2P:R:_FCR3",
1172+
"SCH:{schedule_id}:STEPS:test_op:2P:U:_S5",
1173+
"SCH:{schedule_id}:STEPS:test_op:2P:U:_S6",
1174+
"SCH:{schedule_id}:STEPS:test_op:2P:U:_S7",
1175+
"SCH:{schedule_id}:STEPS:test_op:2P:U:_FCR1",
1176+
"SCH:{schedule_id}:STEPS:test_op:2P:U:_FCR2",
1177+
"SCH:{schedule_id}:STEPS:test_op:2P:U:_FCR3",
11791178
},
11801179
[
11811180
CreateSequence(_S1),
@@ -1572,10 +1571,10 @@ async def undo(
15721571
{
15731572
"SCH:{schedule_id}",
15741573
"SCH:{schedule_id}:GROUPS:test_op:0S:C",
1575-
"SCH:{schedule_id}:GROUPS:test_op:0S:R",
1574+
"SCH:{schedule_id}:GROUPS:test_op:0S:U",
15761575
"SCH:{schedule_id}:OP_CTX:test_op",
15771576
"SCH:{schedule_id}:STEPS:test_op:0S:C:_BadImplementedStep",
1578-
"SCH:{schedule_id}:STEPS:test_op:0S:R:_BadImplementedStep",
1577+
"SCH:{schedule_id}:STEPS:test_op:0S:U:_BadImplementedStep",
15791578
},
15801579
id="create-returns-key-set-to-None",
15811580
),
@@ -1597,10 +1596,10 @@ async def undo(
15971596
{
15981597
"SCH:{schedule_id}",
15991598
"SCH:{schedule_id}:GROUPS:test_op:0S:C",
1600-
"SCH:{schedule_id}:GROUPS:test_op:0S:R",
1599+
"SCH:{schedule_id}:GROUPS:test_op:0S:U",
16011600
"SCH:{schedule_id}:OP_CTX:test_op",
16021601
"SCH:{schedule_id}:STEPS:test_op:0S:C:_BadImplementedStep",
1603-
"SCH:{schedule_id}:STEPS:test_op:0S:R:_BadImplementedStep",
1602+
"SCH:{schedule_id}:STEPS:test_op:0S:U:_BadImplementedStep",
16041603
},
16051604
id="create-does-not-set-the-key-to-return",
16061605
),
@@ -1623,10 +1622,10 @@ async def undo(
16231622
{
16241623
"SCH:{schedule_id}",
16251624
"SCH:{schedule_id}:GROUPS:test_op:0S:C",
1626-
"SCH:{schedule_id}:GROUPS:test_op:0S:R",
1625+
"SCH:{schedule_id}:GROUPS:test_op:0S:U",
16271626
"SCH:{schedule_id}:OP_CTX:test_op",
16281627
"SCH:{schedule_id}:STEPS:test_op:0S:C:_BadImplementedStep",
1629-
"SCH:{schedule_id}:STEPS:test_op:0S:R:_BadImplementedStep",
1628+
"SCH:{schedule_id}:STEPS:test_op:0S:U:_BadImplementedStep",
16301629
},
16311630
id="undo-returns-key-set-to-None",
16321631
),
@@ -1648,10 +1647,10 @@ async def undo(
16481647
{
16491648
"SCH:{schedule_id}",
16501649
"SCH:{schedule_id}:GROUPS:test_op:0S:C",
1651-
"SCH:{schedule_id}:GROUPS:test_op:0S:R",
1650+
"SCH:{schedule_id}:GROUPS:test_op:0S:U",
16521651
"SCH:{schedule_id}:OP_CTX:test_op",
16531652
"SCH:{schedule_id}:STEPS:test_op:0S:C:_BadImplementedStep",
1654-
"SCH:{schedule_id}:STEPS:test_op:0S:R:_BadImplementedStep",
1653+
"SCH:{schedule_id}:STEPS:test_op:0S:U:_BadImplementedStep",
16551654
},
16561655
id="undo-does-not-set-the-key-to-return",
16571656
),

‎services/dynamic-scheduler/tests/unit/services/generic_scheduler/test__store.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ async def test_steps_store_proxy(
199199
step_name="step",
200200
is_creating=is_creating,
201201
)
202-
is_creating_str = "C" if is_creating else "R"
202+
is_creating_str = "C" if is_creating else "U"
203203
hash_key = f"SCH:{schedule_id}:STEPS:op1:sg1:{is_creating_str}:step"
204204

205205
# set

0 commit comments

Comments
 (0)