Integration tests: port to pytest.

criemen · criemen · commit 3badd61a56d0 · 2024-07-18T16:36:11.000+02:00
Requires an internal PR.
diff --git a/javascript/ql/integration-tests/all-platforms/diagnostics/internal-error/diagnostics.expected b/javascript/ql/integration-tests/all-platforms/diagnostics/internal-error/diagnostics.expected
@@ -1,15 +1,14 @@
 {
-    "timestamp": "2023-03-23T12:04:41.317+00:00",
-    "source": {
-        "id": "js/internal-error",
-        "name": "Internal error",
-        "extractorName": "javascript"
-    },
-    "markdownMessage": "Internal error: com.semmle.util.exception.CatastrophicError: The TypeScript parser wrapper crashed with exit code 1",
-    "severity": "unknown",
-    "visibility": {
-        "cliSummaryTable": true,
-        "statusPage": false,
-        "telemetry": true
-    }
-}
+  "markdownMessage": "Internal error: com.semmle.util.exception.CatastrophicError: The TypeScript parser wrapper crashed with exit code 1",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "javascript",
+    "id": "js/internal-error",
+    "name": "Internal error"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
diff --git a/javascript/ql/integration-tests/all-platforms/diagnostics/internal-error/test.py b/javascript/ql/integration-tests/all-platforms/diagnostics/internal-error/test.py
@@ -1,7 +1,2 @@
-import os
-from create_database_utils import *
-from diagnostics_test_utils import *
-
-run_codeql_database_create([], lang="javascript", runFunction = runUnsuccessfully, db = None)
-
-check_diagnostics()
+def test(codeql, javascript):
+    codeql.database.create(_assert_failure=True)
diff --git a/javascript/ql/integration-tests/all-platforms/diagnostics/syntax-error/test.py b/javascript/ql/integration-tests/all-platforms/diagnostics/syntax-error/test.py
@@ -1,7 +1,2 @@
-import os
-from create_database_utils import *
-from diagnostics_test_utils import *
-
-run_codeql_database_create([], lang="javascript", runFunction = runSuccessfully, db = None)
-
-check_diagnostics()
+def test(codeql, javascript):
+    codeql.database.create()
diff --git a/javascript/ql/integration-tests/all-platforms/no-types/test.py b/javascript/ql/integration-tests/all-platforms/no-types/test.py
@@ -1,3 +1,5 @@
-from create_database_utils import *
+# from create_database_utils import *
 
-run_codeql_database_create([], lang="javascript", extra_args=["-Oskip_types=true"])
+# run_codeql_database_create([], lang="javascript", extra_args=["-Oskip_types=true"])
+def test(codeql, javascript):
+    codeql.database.create(extractor_option="skip_types=true")
diff --git a/javascript/ql/integration-tests/all-platforms/qlpack.yml b/javascript/ql/integration-tests/all-platforms/qlpack.yml
diff --git a/javascript/ql/integration-tests/legacy b/javascript/ql/integration-tests/legacy
