updating cuzz with its own time limit

demergent-labs · Dec 20, 2024 · 4b0bb7b · 4b0bb7b
1 parent 8f3f2e9
commit 4b0bb7b
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 23 deletions.
diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
@@ -8,7 +8,7 @@ on:
                 required: false
                 type: string
                 default: '.1'
-            timeout:
+            time-limit:
                 description: 'Length of time (in minutes) after which the fuzz tests will automatically succeed'
                 required: false
                 type: string
@@ -41,5 +41,5 @@ jobs:
                 stable/test/end_to_end/candid_rpc/tuple_types
             fuzz: true
             call-delay: ${{ inputs.call-delay }}
-            timeout: ${{ inputs.timeout }}
+            time-limit: ${{ inputs.time-limit }}
             link-azle: true
diff --git a/.github/workflows/run_test.yml b/.github/workflows/run_test.yml
@@ -25,7 +25,7 @@ on:
                 required: false
                 type: string
                 default: '.1'
-            timeout:
+            time-limit:
                 required: false
                 type: string
                 default: '300'
@@ -157,15 +157,7 @@ jobs:
                   echo "runs=$RUNS" >> $GITHUB_OUTPUT
 
             - name: Run tests
-              run: |
-                  timeout ${{ inputs.timeout }}m npm test
-                  exit_code=$?
-                  if [ $exit_code -eq 124 ] || [ $exit_code -eq 142 ]; then
-                      # Exit code 124 is for timeout, 142 is for SIGALRM
-                      exit 0
-                  else
-                      exit $exit_code
-                  fi
+              run: npm test
               working-directory: ${{ matrix.test.path }}
               shell: bash -l {0}
               env:
@@ -174,3 +166,4 @@ jobs:
                   AZLE_EXPERIMENTAL: ${{ inputs.run-experimental }}
                   AZLE_FUZZ: ${{ inputs.fuzz }}
                   AZLE_FUZZ_CALL_DELAY: ${{ inputs.call-delay }}
+                  AZLE_FUZZ_TIME_LIMIT: ${{ inputs.time-limit }}
diff --git a/examples/stable/test/end_to_end/candid_rpc/async_await/package-lock.json b/examples/stable/test/end_to_end/candid_rpc/async_await/package-lock.json
diff --git a/examples/stable/test/end_to_end/candid_rpc/stable_structures/cuzz.json b/examples/stable/test/end_to_end/candid_rpc/stable_structures/cuzz.json
@@ -8,6 +8,7 @@
         "Method: stableMap17Insert \\(update\\)[\\s\\S]*\"Request ID\":[\\s\\S]*\"Error code\":[\\s\\S]*\"Reject code\":[\\s\\S]*\"Reject message\":.*Uncaught SyntaxError: unexpected data at the end",
         "Method: stableMap17Remove \\(update\\)[\\s\\S]*\"Request ID\":[\\s\\S]*\"Error code\":[\\s\\S]*\"Reject code\":[\\s\\S]*\"Reject message\":.*Uncaught SyntaxError: unexpected token",
         "Method: stableMap17Remove \\(update\\)[\\s\\S]*\"Request ID\":[\\s\\S]*\"Error code\":[\\s\\S]*\"Reject code\":[\\s\\S]*\"Reject message\":.*Uncaught SyntaxError: Unexpected end of JSON input",
+        "Method: stableMap17Remove \\(update\\)[\\s\\S]*\"Request ID\":[\\s\\S]*\"Error code\":[\\s\\S]*\"Reject code\":[\\s\\S]*\"Reject message\":.*Uncaught SyntaxError: unexpected data at the end",
         "Method: stableMap17ContainsKey \\(query\\)[\\s\\S]*\"Status\":[\\s\\S]*\"Code\":[\\s\\S]*\"Message\":.*Uncaught SyntaxError: unexpected token",
         "Method: stableMap17ContainsKey \\(query\\)[\\s\\S]*\"Status\":[\\s\\S]*\"Code\":[\\s\\S]*\"Message\":.*Uncaught SyntaxError: unexpected data at the end",
         "Method: stableMap17ContainsKey \\(query\\)[\\s\\S]*\"Status\":[\\s\\S]*\"Code\":[\\s\\S]*\"Message\":.*Uncaught SyntaxError: Unexpected end of JSON input",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
         "class-transformer": "^0.5.1",
         "class-validator": "^0.14.1",
         "crypto-browserify": "^3.12.0",
-        "cuzz": "github:demergent-labs/cuzz#8f07ef174570bbb142e84516c55ec598a09c625c",
+        "cuzz": "github:demergent-labs/cuzz#e9dcc6fc2f4d55ef880469cbe836b8730b530d07",
         "deep-is": "^0.1.4",
         "esbuild": "^0.24.0",
         "esbuild-plugin-tsc": "^0.4.0",

diff --git a/test/fuzz.ts b/test/fuzz.ts
@@ -61,10 +61,13 @@ function fuzzTestCanister(canisterName: string, callDelay: string): void {
         '--clear-console'
     ];
 
-    const cuzzArgs =
-        process.env.AZLE_FUZZ_TERMINAL === 'true'
-            ? [...baseCuzzArgs, '--terminal']
-            : baseCuzzArgs;
+    const cuzzArgs = [
+        ...baseCuzzArgs,
+        ...(process.env.AZLE_FUZZ_TERMINAL === 'true' ? ['--terminal'] : []),
+        ...(process.env.AZLE_FUZZ_TIME_LIMIT !== undefined
+            ? ['--time-limit', process.env.AZLE_FUZZ_TIME_LIMIT]
+            : [])
+    ];
 
     let cuzzProcess = spawn('node_modules/.bin/cuzz', cuzzArgs, {
         stdio: 'inherit'