Skip to content

Commit 4a71ddd

Browse files
mbgmbg
authored
Merge pull request #15355 from github/mbg/go/increase-test-robustness
Go: Improve robustness of integration tests
2 parents 2d71294 + 783f006 commit 4a71ddd

File tree

98 files changed

+249
-47
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+249
-47
lines changed

‎go/ql/integration-tests/all-platforms/go/bazel-sample-1/BUILD.bazel renamed to ‎go/ql/integration-tests/all-platforms/go/bazel-sample-1/src/BUILD.bazel

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/bazel-sample-1/go.mod renamed to ‎go/ql/integration-tests/all-platforms/go/bazel-sample-1/src/go.mod

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/bazel-sample-1/go.sum renamed to ‎go/ql/integration-tests/all-platforms/go/bazel-sample-1/src/go.sum

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/bazel-sample-1/test.go renamed to ‎go/ql/integration-tests/all-platforms/go/bazel-sample-1/src/test.go

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/bazel-sample-1/todel.go renamed to ‎go/ql/integration-tests/all-platforms/go/bazel-sample-1/src/todel.go

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/bazel-sample-1/test.expected

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
#select
2+
| src/test.go:0:0:0:0 | src/test.go |
3+
| src/todel.go:0:0:0:0 | src/todel.go |
14
htmlFiles
25
extractionErrors
36
| Extraction failed in test.go with error \tother declaration of test | 2 |
47
| Extraction failed in todel.go with error test redeclared in this block | 2 |
5-
#select
6-
| test.go:0:0:0:0 | test.go |
7-
| todel.go:0:0:0:0 | todel.go |

‎go/ql/integration-tests/all-platforms/go/bazel-sample-1/test.py

+13-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
1-
import sys
1+
import os
2+
import subprocess
23

34
from create_database_utils import *
45
from diagnostics_test_utils import *
56

6-
run_codeql_database_create([], lang="go")
7+
# Set up a GOPATH relative to this test's root directory;
8+
# we set os.environ instead of using extra_env because we
9+
# need it to be set for the call to "go clean -modcache" later
10+
goPath = os.path.join(os.path.abspath(os.getcwd()), ".go")
11+
os.environ['GOPATH'] = goPath
12+
13+
run_codeql_database_create([], lang="go", source="src")
714

815
check_diagnostics()
16+
17+
# Clean up the temporary GOPATH to prevent Bazel failures next
18+
# time the tests are run; see https://github.com/golang/go/issues/27161
19+
subprocess.call(["go", "clean", "-modcache"])

‎go/ql/integration-tests/all-platforms/go/bazel-sample-2/BUILD renamed to ‎go/ql/integration-tests/all-platforms/go/bazel-sample-2/src/BUILD

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/bazel-sample-2/go.mod renamed to ‎go/ql/integration-tests/all-platforms/go/bazel-sample-2/src/go.mod

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/bazel-sample-2/go.sum renamed to ‎go/ql/integration-tests/all-platforms/go/bazel-sample-2/src/go.sum

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/bazel-sample-2/test.go renamed to ‎go/ql/integration-tests/all-platforms/go/bazel-sample-2/src/test.go

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/bazel-sample-2/todel.go renamed to ‎go/ql/integration-tests/all-platforms/go/bazel-sample-2/src/todel.go

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/bazel-sample-2/test.expected

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
#select
2+
| src/test.go:0:0:0:0 | src/test.go |
3+
| src/todel.go:0:0:0:0 | src/todel.go |
14
htmlFiles
25
extractionErrors
36
| Extraction failed in test.go with error \tother declaration of test | 2 |
47
| Extraction failed in todel.go with error test redeclared in this block | 2 |
5-
#select
6-
| test.go:0:0:0:0 | test.go |
7-
| todel.go:0:0:0:0 | todel.go |

‎go/ql/integration-tests/all-platforms/go/bazel-sample-2/test.py

+13-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
1-
import sys
1+
import os
2+
import subprocess
23

34
from create_database_utils import *
45
from diagnostics_test_utils import *
56

6-
run_codeql_database_create([], lang="go")
7+
# Set up a GOPATH relative to this test's root directory;
8+
# we set os.environ instead of using extra_env because we
9+
# need it to be set for the call to "go clean -modcache" later
10+
goPath = os.path.join(os.path.abspath(os.getcwd()), ".go")
11+
os.environ['GOPATH'] = goPath
12+
13+
run_codeql_database_create([], lang="go", source="src")
714

815
check_diagnostics()
16+
17+
# Clean up the temporary GOPATH to prevent Bazel failures next
18+
# time the tests are run; see https://github.com/golang/go/issues/27161
19+
subprocess.call(["go", "clean", "-modcache"])

‎go/ql/integration-tests/all-platforms/go/diagnostics/build-constraints-exclude-all-go-files/test.py

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
1-
import sys
1+
import os
2+
import subprocess
23

34
from create_database_utils import *
45
from diagnostics_test_utils import *
56

7+
# Set up a GOPATH relative to this test's root directory;
8+
# we set os.environ instead of using extra_env because we
9+
# need it to be set for the call to "go clean -modcache" later
10+
goPath = os.path.join(os.path.abspath(os.getcwd()), ".go")
11+
os.environ['GOPATH'] = goPath
612
os.environ['LGTM_INDEX_IMPORT_PATH'] = "test"
713
run_codeql_database_create([], lang="go", source="work", db=None)
814

915
check_diagnostics()
16+
17+
# Clean up the temporary GOPATH to prevent Bazel failures next
18+
# time the tests are run; see https://github.com/golang/go/issues/27161
19+
subprocess.call(["go", "clean", "-modcache"])

‎go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/test.py

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
1-
import sys
1+
import os
2+
import subprocess
23

34
from create_database_utils import *
45
from diagnostics_test_utils import *
56

7+
# Set up a GOPATH relative to this test's root directory;
8+
# we set os.environ instead of using extra_env because we
9+
# need it to be set for the call to "go clean -modcache" later
10+
goPath = os.path.join(os.path.abspath(os.getcwd()), ".go")
11+
os.environ['GOPATH'] = goPath
612
os.environ['LGTM_INDEX_IMPORT_PATH'] = "test"
713
run_codeql_database_create([], lang="go", source="work", db=None, runFunction=runUnsuccessfully)
814

915
check_diagnostics()
16+
17+
# Clean up the temporary GOPATH to prevent Bazel failures next
18+
# time the tests are run; see https://github.com/golang/go/issues/27161
19+
subprocess.call(["go", "clean", "-modcache"])

‎go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/test.py

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
1-
import sys
1+
import os
2+
import subprocess
23

34
from create_database_utils import *
45
from diagnostics_test_utils import *
56

7+
# Set up a GOPATH relative to this test's root directory;
8+
# we set os.environ instead of using extra_env because we
9+
# need it to be set for the call to "go clean -modcache" later
10+
goPath = os.path.join(os.path.abspath(os.getcwd()), ".go")
11+
os.environ['GOPATH'] = goPath
612
os.environ['LGTM_INDEX_IMPORT_PATH'] = "test"
713
run_codeql_database_create([], lang="go", source="work", db=None, runFunction=runUnsuccessfully)
814

915
check_diagnostics()
16+
17+
# Clean up the temporary GOPATH to prevent Bazel failures next
18+
# time the tests are run; see https://github.com/golang/go/issues/27161
19+
subprocess.call(["go", "clean", "-modcache"])

‎go/ql/integration-tests/all-platforms/go/diagnostics/no-go-files-found/test.py

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
1-
import sys
1+
import os
2+
import subprocess
23

34
from create_database_utils import *
45
from diagnostics_test_utils import *
56

7+
# Set up a GOPATH relative to this test's root directory;
8+
# we set os.environ instead of using extra_env because we
9+
# need it to be set for the call to "go clean -modcache" later
10+
goPath = os.path.join(os.path.abspath(os.getcwd()), ".go")
11+
os.environ['GOPATH'] = goPath
612
os.environ['LGTM_INDEX_IMPORT_PATH'] = "test"
713
run_codeql_database_create([], lang="go", source="work", db=None, runFunction=runUnsuccessfully)
814

915
check_diagnostics()
16+
17+
# Clean up the temporary GOPATH to prevent Bazel failures next
18+
# time the tests are run; see https://github.com/golang/go/issues/27161
19+
subprocess.call(["go", "clean", "-modcache"])

‎go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-with-go-mod/test.py

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
1-
import sys
1+
import os
2+
import subprocess
23

34
from create_database_utils import *
45
from diagnostics_test_utils import *
56

7+
# Set up a GOPATH relative to this test's root directory;
8+
# we set os.environ instead of using extra_env because we
9+
# need it to be set for the call to "go clean -modcache" later
10+
goPath = os.path.join(os.path.abspath(os.getcwd()), ".go")
11+
os.environ['GOPATH'] = goPath
612
os.environ['LGTM_INDEX_IMPORT_PATH'] = "test"
713
run_codeql_database_create([], lang="go", source="work", db=None)
814

915
check_diagnostics()
16+
17+
# Clean up the temporary GOPATH to prevent Bazel failures next
18+
# time the tests are run; see https://github.com/golang/go/issues/27161
19+
subprocess.call(["go", "clean", "-modcache"])

‎go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-without-go-mod/test.py

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
1-
import sys
1+
import os
2+
import subprocess
23

34
from create_database_utils import *
45
from diagnostics_test_utils import *
56

7+
# Set up a GOPATH relative to this test's root directory;
8+
# we set os.environ instead of using extra_env because we
9+
# need it to be set for the call to "go clean -modcache" later
10+
goPath = os.path.join(os.path.abspath(os.getcwd()), ".go")
11+
os.environ['GOPATH'] = goPath
612
os.environ['LGTM_INDEX_IMPORT_PATH'] = "test"
713
run_codeql_database_create([], lang="go", source="work", db=None)
814

915
check_diagnostics()
16+
17+
# Clean up the temporary GOPATH to prevent Bazel failures next
18+
# time the tests are run; see https://github.com/golang/go/issues/27161
19+
subprocess.call(["go", "clean", "-modcache"])

‎go/ql/integration-tests/all-platforms/go/diagnostics/unsupported-relative-path/test.py

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
1-
import sys
1+
import os
2+
import subprocess
23

34
from create_database_utils import *
45
from diagnostics_test_utils import *
56

7+
# Set up a GOPATH relative to this test's root directory;
8+
# we set os.environ instead of using extra_env because we
9+
# need it to be set for the call to "go clean -modcache" later
10+
goPath = os.path.join(os.path.abspath(os.getcwd()), ".go")
11+
os.environ['GOPATH'] = goPath
612
os.environ['GITHUB_REPOSITORY'] = "a/b"
713
run_codeql_database_create([], lang="go", source="work", db=None, runFunction=runUnsuccessfully)
814

915
check_diagnostics()
16+
17+
# Clean up the temporary GOPATH to prevent Bazel failures next
18+
# time the tests are run; see https://github.com/golang/go/issues/27161
19+
subprocess.call(["go", "clean", "-modcache"])

‎go/ql/integration-tests/all-platforms/go/go-get-without-modules-sample/test.go renamed to ‎go/ql/integration-tests/all-platforms/go/go-get-without-modules-sample/src/test.go

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/go-get-without-modules-sample/test.expected

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1+
#select
2+
| src/test.go:0:0:0:0 | src/test.go |
13
htmlFiles
24
extractionErrors
3-
#select
4-
| test.go:0:0:0:0 | test.go |

‎go/ql/integration-tests/all-platforms/go/go-get-without-modules-sample/test.py

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1-
import sys
1+
import os
2+
import subprocess
23

34
from create_database_utils import *
45

5-
run_codeql_database_create([], lang="go")
6+
# Set up a GOPATH relative to this test's root directory;
7+
# we set os.environ instead of using extra_env because we
8+
# need it to be set for the call to "go clean -modcache" later
9+
goPath = os.path.join(os.path.abspath(os.getcwd()), ".go")
10+
os.environ['GOPATH'] = goPath
11+
run_codeql_database_create([], lang="go", source="src")
12+
13+
# Clean up the temporary GOPATH to prevent Bazel failures next
14+
# time the tests are run; see https://github.com/golang/go/issues/27161
15+
subprocess.call(["go", "clean", "-modcache"])

‎go/ql/integration-tests/all-platforms/go/go-mod-sample/Makefile renamed to ‎go/ql/integration-tests/all-platforms/go/go-mod-sample/src/Makefile

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/go-mod-sample/go.mod renamed to ‎go/ql/integration-tests/all-platforms/go/go-mod-sample/src/go.mod

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/go-mod-sample/go.sum renamed to ‎go/ql/integration-tests/all-platforms/go/go-mod-sample/src/go.sum

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/go-mod-sample/test.go renamed to ‎go/ql/integration-tests/all-platforms/go/go-mod-sample/src/test.go

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/go-mod-sample/test.expected

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1+
#select
2+
| src/test.go:0:0:0:0 | src/test.go |
13
htmlFiles
24
extractionErrors
3-
#select
4-
| test.go:0:0:0:0 | test.go |

‎go/ql/integration-tests/all-platforms/go/go-mod-sample/test.py

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1-
import sys
1+
import os
2+
import subprocess
23

34
from create_database_utils import *
45

5-
run_codeql_database_create([], lang="go")
6+
# Set up a GOPATH relative to this test's root directory;
7+
# we set os.environ instead of using extra_env because we
8+
# need it to be set for the call to "go clean -modcache" later
9+
goPath = os.path.join(os.path.abspath(os.getcwd()), ".go")
10+
os.environ['GOPATH'] = goPath
11+
run_codeql_database_create([], lang="go", source="src")
12+
13+
# Clean up the temporary GOPATH to prevent Bazel failures next
14+
# time the tests are run; see https://github.com/golang/go/issues/27161
15+
subprocess.call(["go", "clean", "-modcache"])

‎go/ql/integration-tests/all-platforms/go/make-sample/Makefile renamed to ‎go/ql/integration-tests/all-platforms/go/make-sample/src/Makefile

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/make-sample/go.mod renamed to ‎go/ql/integration-tests/all-platforms/go/make-sample/src/go.mod

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/make-sample/go.sum renamed to ‎go/ql/integration-tests/all-platforms/go/make-sample/src/go.sum

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/make-sample/test.go renamed to ‎go/ql/integration-tests/all-platforms/go/make-sample/src/test.go

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/make-sample/todel.go renamed to ‎go/ql/integration-tests/all-platforms/go/make-sample/src/todel.go

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/make-sample/test.expected

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1+
#select
2+
| src/test.go:0:0:0:0 | src/test.go |
13
htmlFiles
24
extractionErrors
3-
#select
4-
| test.go:0:0:0:0 | test.go |

‎go/ql/integration-tests/all-platforms/go/make-sample/test.py

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1-
import sys
1+
import os
2+
import subprocess
23

34
from create_database_utils import *
45

5-
run_codeql_database_create([], lang="go")
6+
# Set up a GOPATH relative to this test's root directory;
7+
# we set os.environ instead of using extra_env because we
8+
# need it to be set for the call to "go clean -modcache" later
9+
goPath = os.path.join(os.path.abspath(os.getcwd()), ".go")
10+
os.environ['GOPATH'] = goPath
11+
run_codeql_database_create([], lang="go", source="src")
12+
13+
# Clean up the temporary GOPATH to prevent Bazel failures next
14+
# time the tests are run; see https://github.com/golang/go/issues/27161
15+
subprocess.call(["go", "clean", "-modcache"])

‎go/ql/integration-tests/all-platforms/go/ninja-sample/.ninja_log renamed to ‎go/ql/integration-tests/all-platforms/go/ninja-sample/src/.ninja_log

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/ninja-sample/build.ninja renamed to ‎go/ql/integration-tests/all-platforms/go/ninja-sample/src/build.ninja

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/ninja-sample/go.mod renamed to ‎go/ql/integration-tests/all-platforms/go/ninja-sample/src/go.mod

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/ninja-sample/go.sum renamed to ‎go/ql/integration-tests/all-platforms/go/ninja-sample/src/go.sum

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/ninja-sample/test.go renamed to ‎go/ql/integration-tests/all-platforms/go/ninja-sample/src/test.go

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/ninja-sample/todel.go renamed to ‎go/ql/integration-tests/all-platforms/go/ninja-sample/src/todel.go

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/ninja-sample/test.expected

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1+
#select
2+
| src/test.go:0:0:0:0 | src/test.go |
13
htmlFiles
24
extractionErrors
3-
#select
4-
| test.go:0:0:0:0 | test.go |

‎go/ql/integration-tests/all-platforms/go/ninja-sample/test.py

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1-
import sys
1+
import os
2+
import subprocess
23

34
from create_database_utils import *
45

5-
run_codeql_database_create([], lang="go")
6+
# Set up a GOPATH relative to this test's root directory;
7+
# we set os.environ instead of using extra_env because we
8+
# need it to be set for the call to "go clean -modcache" later
9+
goPath = os.path.join(os.path.abspath(os.getcwd()), ".go")
10+
os.environ['GOPATH'] = goPath
11+
run_codeql_database_create([], lang="go", source="src")
12+
13+
# Clean up the temporary GOPATH to prevent Bazel failures next
14+
# time the tests are run; see https://github.com/golang/go/issues/27161
15+
subprocess.call(["go", "clean", "-modcache"])

‎go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/main.go renamed to ‎go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/src/main.go

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/subdir/go.mod renamed to ‎go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/src/subdir/go.mod

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/subdir/go.sum renamed to ‎go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/src/subdir/go.sum

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/subdir/subsubdir/add.go renamed to ‎go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/src/subdir/subsubdir/add.go

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/subdir/test.go renamed to ‎go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/src/subdir/test.go

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/test.py

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
1-
import sys
1+
import os
2+
import subprocess
23

34
from create_database_utils import *
45
from diagnostics_test_utils import *
56

6-
run_codeql_database_create([], lang="go")
7+
# Set up a GOPATH relative to this test's root directory;
8+
# we set os.environ instead of using extra_env because we
9+
# need it to be set for the call to "go clean -modcache" later
10+
goPath = os.path.join(os.path.abspath(os.getcwd()), ".go")
11+
os.environ['GOPATH'] = goPath
12+
run_codeql_database_create([], lang="go", source="src")
713

814
check_diagnostics()
15+
16+
# Clean up the temporary GOPATH to prevent Bazel failures next
17+
# time the tests are run; see https://github.com/golang/go/issues/27161
18+
subprocess.call(["go", "clean", "-modcache"])

‎go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/go.mod renamed to ‎go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/src/go.mod

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/go.sum renamed to ‎go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/src/go.sum

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/subdir/add.go renamed to ‎go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/src/subdir/add.go

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/test.go renamed to ‎go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/src/test.go

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/test.py

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
1-
import sys
1+
import os
2+
import subprocess
23

34
from create_database_utils import *
45
from diagnostics_test_utils import *
56

6-
run_codeql_database_create([], lang="go")
7+
# Set up a GOPATH relative to this test's root directory;
8+
# we set os.environ instead of using extra_env because we
9+
# need it to be set for the call to "go clean -modcache" later
10+
goPath = os.path.join(os.path.abspath(os.getcwd()), ".go")
11+
os.environ['GOPATH'] = goPath
12+
run_codeql_database_create([], lang="go", source="src")
713

814
check_diagnostics()
15+
16+
# Clean up the temporary GOPATH to prevent Bazel failures next
17+
# time the tests are run; see https://github.com/golang/go/issues/27161
18+
subprocess.call(["go", "clean", "-modcache"])

‎go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/subdir/go.mod renamed to ‎go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/src/subdir/go.mod

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/subdir/go.sum renamed to ‎go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/src/subdir/go.sum

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/subdir/subsubdir/add.go renamed to ‎go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/src/subdir/subsubdir/add.go

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/subdir/test.go renamed to ‎go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/src/subdir/test.go

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/test.py

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
1-
import sys
1+
import os
2+
import subprocess
23

34
from create_database_utils import *
45
from diagnostics_test_utils import *
56

6-
run_codeql_database_create([], lang="go")
7+
# Set up a GOPATH relative to this test's root directory;
8+
# we set os.environ instead of using extra_env because we
9+
# need it to be set for the call to "go clean -modcache" later
10+
goPath = os.path.join(os.path.abspath(os.getcwd()), ".go")
11+
os.environ['GOPATH'] = goPath
12+
run_codeql_database_create([], lang="go", source="src")
713

814
check_diagnostics()
15+
16+
# Clean up the temporary GOPATH to prevent Bazel failures next
17+
# time the tests are run; see https://github.com/golang/go/issues/27161
18+
subprocess.call(["go", "clean", "-modcache"])

‎go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/modules/go.work renamed to ‎go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/go.work

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/modules/subdir1/go.mod renamed to ‎go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/subdir1/go.mod

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/modules/subdir1/go.sum renamed to ‎go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/subdir1/go.sum

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/modules/subdir1/subsubdir1/add.go renamed to ‎go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/subdir1/subsubdir1/add.go

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/modules/subdir1/test.go renamed to ‎go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/subdir1/test.go

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/modules/subdir2/go.mod renamed to ‎go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/subdir2/go.mod

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/modules/subdir2/go.sum renamed to ‎go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/subdir2/go.sum

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/modules/subdir2/subsubdir2/add.go renamed to ‎go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/subdir2/subsubdir2/add.go

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/modules/subdir2/test.go renamed to ‎go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/src/modules/subdir2/test.go

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/test.py

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
1-
import sys
1+
import os
2+
import subprocess
23

34
from create_database_utils import *
45
from diagnostics_test_utils import *
56

6-
run_codeql_database_create([], lang="go")
7+
# Set up a GOPATH relative to this test's root directory;
8+
# we set os.environ instead of using extra_env because we
9+
# need it to be set for the call to "go clean -modcache" later
10+
goPath = os.path.join(os.path.abspath(os.getcwd()), ".go")
11+
os.environ['GOPATH'] = goPath
12+
run_codeql_database_create([], lang="go", source="src")
713

814
check_diagnostics()
15+
16+
# Clean up the temporary GOPATH to prevent Bazel failures next
17+
# time the tests are run; see https://github.com/golang/go/issues/27161
18+
subprocess.call(["go", "clean", "-modcache"])

‎go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/subdir0/go.mod renamed to ‎go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/src/subdir0/go.mod

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/subdir0/go.sum renamed to ‎go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/src/subdir0/go.sum

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/subdir0/subdir1/go.mod renamed to ‎go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/src/subdir0/subdir1/go.mod

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/subdir0/subdir1/go.sum renamed to ‎go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/src/subdir0/subdir1/go.sum

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/subdir0/subdir1/subsubdir1/add.go renamed to ‎go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/src/subdir0/subdir1/subsubdir1/add.go

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/subdir0/subdir1/test.go renamed to ‎go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/src/subdir0/subdir1/test.go

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/subdir0/subdir2/add.go renamed to ‎go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/src/subdir0/subdir2/add.go

File renamed without changes.

‎go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/subdir0/test.go renamed to ‎go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/src/subdir0/test.go

File renamed without changes.

0 commit comments

Comments
 (0)