Add pack download to its own log group

Also, make the baseline count message less awkward sounding.
github · Jun 9, 2021 · a2e96a4 · a2e96a4
1 parent 96e7de3
commit a2e96a4
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 22 deletions.
diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
@@ -136,7 +136,7 @@ jobs:
         EXPECTED_RULES="javascript/example/empty-or-one-block javascript/example/empty-or-one-block javascript/example/two-block"
 
         # use tr to replace newlines with spaces and xargs to trim leading and trailing whitespace
-        RULES="$(cat javascript-custom.sarif | jq -r '.runs[0].results[].ruleId' | sort | tr "\n" " " | xargs)"
+        RULES="$(cat javascript.sarif | jq -r '.runs[0].results[].ruleId' | sort | tr "\n" " " | xargs)"
         echo "Found matching rules '$RULES'"
         if [ "$RULES" != "$EXPECTED_RULES" ]; then
           echo "Did not match expected rules '$EXPECTED_RULES'."

diff --git a/lib/analyze.js b/lib/analyze.js
diff --git a/lib/analyze.js.map b/lib/analyze.js.map
diff --git a/lib/analyze.test.js b/lib/analyze.test.js
diff --git a/lib/analyze.test.js.map b/lib/analyze.test.js.map
diff --git a/lib/config-utils.test.js b/lib/config-utils.test.js
diff --git a/lib/config-utils.test.js.map b/lib/config-utils.test.js.map
diff --git a/src/analyze.test.ts b/src/analyze.test.ts
@@ -136,13 +136,31 @@ test("status report fields and search path setting", async (t) => {
         getRunnerLogger(true)
       );
       const hasPacks = language in packs;
-      t.deepEqual(Object.keys(builtinStatusReport).length, hasPacks ? 2 : 1);
-      t.true(
-        `analyze_builtin_queries_${language}_duration_ms` in builtinStatusReport
-      );
-      t.true(
-        `interpret_results_${language}_duration_ms` in builtinStatusReport
-      );
+      const statusReportKeys = Object.keys(builtinStatusReport).sort();
+      if (hasPacks) {
+        t.deepEqual(statusReportKeys.length, 3, statusReportKeys.toString());
+        t.deepEqual(
+          statusReportKeys[0],
+          `analyze_builtin_queries_${language}_duration_ms`
+        );
+        t.deepEqual(
+          statusReportKeys[1],
+          `analyze_custom_queries_${language}_duration_ms`
+        );
+        t.deepEqual(
+          statusReportKeys[2],
+          `interpret_results_${language}_duration_ms`
+        );
+      } else {
+        t.deepEqual(
+          statusReportKeys[0],
+          `analyze_builtin_queries_${language}_duration_ms`
+        );
+        t.deepEqual(
+          statusReportKeys[1],
+          `interpret_results_${language}_duration_ms`
+        );
+      }
 
       config.queries[language] = {
         builtin: [],