Merge pull request #17149 from github/criemen/pytest-go

Port the go integration tests to pytest framework
github · Aug 9, 2024 · d82f66c · d82f66c
2 parents d97f657 + cdf0677
commit d82f66c
Show file tree

Hide file tree

Showing 81 changed files with 86 additions and 162 deletions.
diff --git a/go/integration-tests-lib/go_integration_test.py b/go/integration-tests-lib/go_integration_test.py
diff --git a/...bazel-sample-1/build-environment.expected → ...bazel-sample-1/build_environment.expected b/...bazel-sample-1/build-environment.expected → ...bazel-sample-1/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-1/force_sequential_test_execution b/go/ql/integration-tests/all-platforms/go/bazel-sample-1/force_sequential_test_execution
diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-1/test.py b/go/ql/integration-tests/all-platforms/go/bazel-sample-1/test.py
@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")
diff --git a/...bazel-sample-2/build-environment.expected → ...bazel-sample-2/build_environment.expected b/...bazel-sample-2/build-environment.expected → ...bazel-sample-2/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-2/force_sequential_test_execution b/go/ql/integration-tests/all-platforms/go/bazel-sample-2/force_sequential_test_execution
diff --git a/go/ql/integration-tests/all-platforms/go/bazel-sample-2/test.py b/go/ql/integration-tests/all-platforms/go/bazel-sample-2/test.py
@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")
diff --git a/...e-all-go-files/build-environment.expected → ...e-all-go-files/build_environment.expected b/...e-all-go-files/build-environment.expected → ...e-all-go-files/build_environment.expected
diff --git a/...gration-tests/all-platforms/go/diagnostics/build-constraints-exclude-all-go-files/test.py b/...gration-tests/all-platforms/go/diagnostics/build-constraints-exclude-all-go-files/test.py
@@ -1,6 +1,8 @@
 import os
+import pytest
 
-from go_integration_test import *
 
-os.environ['LGTM_INDEX_IMPORT_PATH'] = "test"
-go_integration_test(source="work", db=None)
+def test(codeql, go, check_build_environment):
+    check_build_environment.source_root = "work"
+    os.environ["LGTM_INDEX_IMPORT_PATH"] = "test"
+    codeql.database.create(source_root="work")
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/force_sequential_test_execution b/go/ql/integration-tests/all-platforms/go/diagnostics/force_sequential_test_execution
diff --git a/...-not-processed/build-environment.expected → ...-not-processed/build_environment.expected b/...-not-processed/build-environment.expected → ...-not-processed/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/test.py b/go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/test.py
@@ -1,6 +1,7 @@
 import os
 
-from go_integration_test import *
 
-os.environ['LGTM_INDEX_IMPORT_PATH'] = "test"
-go_integration_test(source="work")
+def test(codeql, go, check_build_environment):
+    check_build_environment.source_root = "work"
+    os.environ["LGTM_INDEX_IMPORT_PATH"] = "test"
+    codeql.database.create(source_root="work")
diff --git a/...lchain-version/build-environment.expected → ...lchain-version/build_environment.expected b/...lchain-version/build-environment.expected → ...lchain-version/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/invalid-toolchain-version/test.py b/go/ql/integration-tests/all-platforms/go/diagnostics/invalid-toolchain-version/test.py
@@ -1,6 +1,6 @@
 import os
 
-from go_integration_test import *
 
-os.environ['LGTM_INDEX_IMPORT_PATH'] = "test"
-go_integration_test()
+def test(codeql, go):
+    os.environ["LGTM_INDEX_IMPORT_PATH"] = "test"
+    codeql.database.create(source_root="src")
diff --git a/...version-needed/build-environment.expected → ...version-needed/build_environment.expected b/...version-needed/build-environment.expected → ...version-needed/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/test.py b/go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/test.py
@@ -1,6 +1,7 @@
 import os
 
-from go_integration_test import *
 
-os.environ['LGTM_INDEX_IMPORT_PATH'] = "test"
-go_integration_test(source="work", db=None, runFunction=runUnsuccessfully)
+def test(codeql, go, check_build_environment):
+    check_build_environment.source_root = "work"
+    os.environ["LGTM_INDEX_IMPORT_PATH"] = "test"
+    codeql.database.create(source_root="work", _assert_failure=True)
diff --git a/...go-files-found/build-environment.expected → ...go-files-found/build_environment.expected b/...go-files-found/build-environment.expected → ...go-files-found/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/no-go-files-found/test.py b/go/ql/integration-tests/all-platforms/go/diagnostics/no-go-files-found/test.py
@@ -1,6 +1,7 @@
 import os
 
-from go_integration_test import *
 
-os.environ['LGTM_INDEX_IMPORT_PATH'] = "test"
-go_integration_test(source="work", db=None, runFunction=runUnsuccessfully)
+def test(codeql, go, check_build_environment):
+    check_build_environment.source_root = "work"
+    os.environ["LGTM_INDEX_IMPORT_PATH"] = "test"
+    codeql.database.create(source_root="work", _assert_failure=True)
diff --git a/...nd-with-go-mod/build-environment.expected → ...nd-with-go-mod/build_environment.expected b/...nd-with-go-mod/build-environment.expected → ...nd-with-go-mod/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-with-go-mod/test.py b/go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-with-go-mod/test.py
@@ -1,6 +1,7 @@
 import os
 
-from go_integration_test import *
 
-os.environ['LGTM_INDEX_IMPORT_PATH'] = "test"
-go_integration_test(source="work", db=None)
+def test(codeql, go, check_build_environment):
+    check_build_environment.source_root = "work"
+    os.environ["LGTM_INDEX_IMPORT_PATH"] = "test"
+    codeql.database.create(source_root="work")
diff --git a/...without-go-mod/build-environment.expected → ...without-go-mod/build_environment.expected b/...without-go-mod/build-environment.expected → ...without-go-mod/build_environment.expected
diff --git a/...l/integration-tests/all-platforms/go/diagnostics/package-not-found-without-go-mod/test.py b/...l/integration-tests/all-platforms/go/diagnostics/package-not-found-without-go-mod/test.py
@@ -1,6 +1,7 @@
 import os
 
-from go_integration_test import *
 
-os.environ['LGTM_INDEX_IMPORT_PATH'] = "test"
-go_integration_test(source="work", db=None)
+def test(codeql, go, check_build_environment):
+    check_build_environment.source_root = "work"
+    os.environ["LGTM_INDEX_IMPORT_PATH"] = "test"
+    codeql.database.create(source_root="work")
diff --git a/...-relative-path/build-environment.expected → ...-relative-path/build_environment.expected b/...-relative-path/build-environment.expected → ...-relative-path/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/diagnostics/unsupported-relative-path/test.py b/go/ql/integration-tests/all-platforms/go/diagnostics/unsupported-relative-path/test.py
@@ -1,6 +1,7 @@
 import os
 
-from go_integration_test import *
 
-os.environ['GITHUB_REPOSITORY'] = "a/b"
-go_integration_test(source="work", db=None)
+def test(codeql, go, check_build_environment):
+    check_build_environment.source_root = "work"
+    os.environ["GITHUB_REPOSITORY"] = "a/b"
+    codeql.database.create(source_root="work")
diff --git a/...extract-vendor/build-environment.expected → ...extract-vendor/build_environment.expected b/...extract-vendor/build-environment.expected → ...extract-vendor/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/extract-vendor/force_sequential_test_execution b/go/ql/integration-tests/all-platforms/go/extract-vendor/force_sequential_test_execution
diff --git a/go/ql/integration-tests/all-platforms/go/extract-vendor/test.py b/go/ql/integration-tests/all-platforms/go/extract-vendor/test.py
@@ -1,4 +1,6 @@
-from go_integration_test import *
+import os
 
-os.environ['CODEQL_EXTRACTOR_GO_EXTRACT_VENDOR_DIRS'] = "true"
-go_integration_test()
+
+def test(codeql, go):
+    os.environ["CODEQL_EXTRACTOR_GO_EXTRACT_VENDOR_DIRS"] = "true"
+    codeql.database.create(source_root="src")
diff --git a/...modules-sample/build-environment.expected → ...modules-sample/build_environment.expected b/...modules-sample/build-environment.expected → ...modules-sample/build_environment.expected
diff --git a/...tion-tests/all-platforms/go/go-get-without-modules-sample/force_sequential_test_execution b/...tion-tests/all-platforms/go/go-get-without-modules-sample/force_sequential_test_execution
diff --git a/go/ql/integration-tests/all-platforms/go/go-get-without-modules-sample/test.py b/go/ql/integration-tests/all-platforms/go/go-get-without-modules-sample/test.py
@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")
diff --git a/.../go-mod-sample/build-environment.expected → .../go-mod-sample/build_environment.expected b/.../go-mod-sample/build-environment.expected → .../go-mod-sample/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/go-mod-sample/force_sequential_test_execution b/go/ql/integration-tests/all-platforms/go/go-mod-sample/force_sequential_test_execution
diff --git a/go/ql/integration-tests/all-platforms/go/go-mod-sample/test.py b/go/ql/integration-tests/all-platforms/go/go-mod-sample/test.py
@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")
diff --git a/...ithout-version/build-environment.expected → ...ithout-version/build_environment.expected b/...ithout-version/build-environment.expected → ...ithout-version/build_environment.expected
diff --git a/...integration-tests/all-platforms/go/go-mod-without-version/force_sequential_test_execution b/...integration-tests/all-platforms/go/go-mod-without-version/force_sequential_test_execution
diff --git a/go/ql/integration-tests/all-platforms/go/go-mod-without-version/test.py b/go/ql/integration-tests/all-platforms/go/go-mod-without-version/test.py
@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")
diff --git a/...o-version-bump/build-environment.expected → ...o-version-bump/build_environment.expected b/...o-version-bump/build-environment.expected → ...o-version-bump/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/go-version-bump/test.py b/go/ql/integration-tests/all-platforms/go/go-version-bump/test.py
@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")
diff --git a/...go/make-sample/build-environment.expected → ...go/make-sample/build_environment.expected b/...go/make-sample/build-environment.expected → ...go/make-sample/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/make-sample/force_sequential_test_execution b/go/ql/integration-tests/all-platforms/go/make-sample/force_sequential_test_execution
diff --git a/go/ql/integration-tests/all-platforms/go/make-sample/test.py b/go/ql/integration-tests/all-platforms/go/make-sample/test.py
@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")
diff --git a/...o/mixed-layout/build-environment.expected → ...o/mixed-layout/build_environment.expected b/...o/mixed-layout/build-environment.expected → ...o/mixed-layout/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/mixed-layout/force_sequential_test_execution b/go/ql/integration-tests/all-platforms/go/mixed-layout/force_sequential_test_execution
diff --git a/go/ql/integration-tests/all-platforms/go/mixed-layout/test.py b/go/ql/integration-tests/all-platforms/go/mixed-layout/test.py
@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")
diff --git a/...o/ninja-sample/build-environment.expected → ...o/ninja-sample/build_environment.expected b/...o/ninja-sample/build-environment.expected → ...o/ninja-sample/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/ninja-sample/force_sequential_test_execution b/go/ql/integration-tests/all-platforms/go/ninja-sample/force_sequential_test_execution
diff --git a/go/ql/integration-tests/all-platforms/go/ninja-sample/test.py b/go/ql/integration-tests/all-platforms/go/ninja-sample/test.py
@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")
diff --git a/go/ql/integration-tests/all-platforms/go/qlpack.yml b/go/ql/integration-tests/all-platforms/go/qlpack.yml
diff --git a/...ewer-go-needed/build-environment.expected → ...ewer-go-needed/build_environment.expected b/...ewer-go-needed/build-environment.expected → ...ewer-go-needed/build_environment.expected
diff --git a/go/ql/integration-tests/all-platforms/go/resolve-build-environment/newer-go-needed/test.py b/go/ql/integration-tests/all-platforms/go/resolve-build-environment/newer-go-needed/test.py
@@ -1,3 +1,3 @@
-from go_integration_test import *
-
-go_integration_test(toolchain="go1.21.0")
+def test(codeql, go, check_build_environment):
+    check_build_environment.env = {"GOTOOLCHAIN": "go1.21.0"}
+    codeql.database.create(source_root="src")
diff --git a/...s-not-under-it/build-environment.expected → ...s-not-under-it/build_environment.expected b/...s-not-under-it/build-environment.expected → ...s-not-under-it/build_environment.expected
diff --git a/.../all-platforms/go/single-go-mod-and-go-files-not-under-it/force_sequential_test_execution b/.../all-platforms/go/single-go-mod-and-go-files-not-under-it/force_sequential_test_execution
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/test.py b/go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/test.py
@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")
diff --git a/...go-mod-in-root/build-environment.expected → ...go-mod-in-root/build_environment.expected b/...go-mod-in-root/build-environment.expected → ...go-mod-in-root/build_environment.expected
diff --git a/.../integration-tests/all-platforms/go/single-go-mod-in-root/force_sequential_test_execution b/.../integration-tests/all-platforms/go/single-go-mod-in-root/force_sequential_test_execution
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/test.py b/go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/test.py
@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")
diff --git a/...od-not-in-root/build-environment.expected → ...od-not-in-root/build_environment.expected b/...od-not-in-root/build-environment.expected → ...od-not-in-root/build_environment.expected
diff --git a/...egration-tests/all-platforms/go/single-go-mod-not-in-root/force_sequential_test_execution b/...egration-tests/all-platforms/go/single-go-mod-not-in-root/force_sequential_test_execution
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/test.py b/go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/test.py
@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")
diff --git a/...rk-not-in-root/build-environment.expected → ...rk-not-in-root/build_environment.expected b/...rk-not-in-root/build-environment.expected → ...rk-not-in-root/build_environment.expected
diff --git a/...gration-tests/all-platforms/go/single-go-work-not-in-root/force_sequential_test_execution b/...gration-tests/all-platforms/go/single-go-work-not-in-root/force_sequential_test_execution
diff --git a/go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/test.py b/go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/test.py
@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")
diff --git a/...d-none-in-root/build-environment.expected → ...d-none-in-root/build_environment.expected b/...d-none-in-root/build-environment.expected → ...d-none-in-root/build_environment.expected
diff --git a/...on-tests/all-platforms/go/two-go-mods-nested-none-in-root/force_sequential_test_execution b/...on-tests/all-platforms/go/two-go-mods-nested-none-in-root/force_sequential_test_execution
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/test.py b/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/test.py
@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")
diff --git a/...ed-one-in-root/build-environment.expected → ...ed-one-in-root/build_environment.expected b/...ed-one-in-root/build-environment.expected → ...ed-one-in-root/build_environment.expected
diff --git a/...ion-tests/all-platforms/go/two-go-mods-nested-one-in-root/force_sequential_test_execution b/...ion-tests/all-platforms/go/two-go-mods-nested-one-in-root/force_sequential_test_execution
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/test.py b/go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/test.py
@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")
diff --git a/...ods-not-nested/build-environment.expected → ...ods-not-nested/build_environment.expected b/...ods-not-nested/build-environment.expected → ...ods-not-nested/build_environment.expected
diff --git a/...integration-tests/all-platforms/go/two-go-mods-not-nested/force_sequential_test_execution b/...integration-tests/all-platforms/go/two-go-mods-not-nested/force_sequential_test_execution
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/test.py b/go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/test.py
@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")
diff --git a/...ds-one-failure/build-environment.expected → ...ds-one-failure/build_environment.expected b/...ds-one-failure/build-environment.expected → ...ds-one-failure/build_environment.expected
diff --git a/...ntegration-tests/all-platforms/go/two-go-mods-one-failure/force_sequential_test_execution b/...ntegration-tests/all-platforms/go/two-go-mods-one-failure/force_sequential_test_execution
diff --git a/go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/test.py b/go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/test.py
@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")
diff --git a/go/ql/integration-tests/legacy b/go/ql/integration-tests/legacy
diff --git a/.../go/dep-sample/build-environment.expected → .../go/dep-sample/build_environment.expected b/.../go/dep-sample/build-environment.expected → .../go/dep-sample/build_environment.expected
diff --git a/go/ql/integration-tests/linux-only/go/dep-sample/force_sequential_test_execution b/go/ql/integration-tests/linux-only/go/dep-sample/force_sequential_test_execution
diff --git a/go/ql/integration-tests/linux-only/go/dep-sample/test.py b/go/ql/integration-tests/linux-only/go/dep-sample/test.py
@@ -1,6 +1,9 @@
 import os
+import runs_on
 
-from go_integration_test import *
 
-os.environ['LGTM_INDEX_IMPORT_PATH'] = "deptest"
-go_integration_test(source="work")
+@runs_on.linux
+def test(codeql, go, check_build_environment):
+    check_build_environment.source_root = "work"
+    os.environ["LGTM_INDEX_IMPORT_PATH"] = "deptest"
+    codeql.database.create(source_root="work")
diff --git a/...o/glide-sample/build-environment.expected → ...o/glide-sample/build_environment.expected b/...o/glide-sample/build-environment.expected → ...o/glide-sample/build_environment.expected
diff --git a/go/ql/integration-tests/linux-only/go/glide-sample/test.py b/go/ql/integration-tests/linux-only/go/glide-sample/test.py
@@ -1,6 +1,9 @@
 import os
+import runs_on
 
-from go_integration_test import *
 
-os.environ['LGTM_INDEX_IMPORT_PATH'] = "glidetest"
-go_integration_test(source="work")
+@runs_on.linux
+def test(codeql, go, check_build_environment):
+    check_build_environment.source_root = "work"
+    os.environ["LGTM_INDEX_IMPORT_PATH"] = "glidetest"
+    codeql.database.create(source_root="work")
diff --git a/go/ql/integration-tests/linux-only/go/qlpack.yml b/go/ql/integration-tests/linux-only/go/qlpack.yml