Fix sequencer reset ordering and timeouts (faucetsdn#1069)

khyatimahendru · Jan 15, 2025 · c114ba4 · c114ba4
1 parent d6ed237
commit c114ba4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
@@ -69,7 +69,7 @@ jobs:
   simple:
     name: Simple sequence test
     runs-on: ubuntu-latest
-    timeout-minutes: 5
+    timeout-minutes: 10
     needs: images
     strategy:
       fail-fast: false

diff --git a/validator/src/main/java/com/google/daq/mqtt/sequencer/SequenceBase.java b/validator/src/main/java/com/google/daq/mqtt/sequencer/SequenceBase.java
@@ -822,10 +822,11 @@ public void setUp() {
 
     resetDeviceConfig(true);
 
-    returnAltRegistryRedirect();
-
+    // Do this before altRegistryRedirect() because of the change-detecting process.
     resetConfig(resetRequired);
 
+    returnAltRegistryRedirect();
+
     updateConfig("initial setup");
 
     debug(format("Stale state cutoff threshold is %s", isoConvert(stateCutoffThreshold)));