From 5b06de6b11fcad50a5e51f003119317811b7e0ef Mon Sep 17 00:00:00 2001 From: Chris Smowton Date: Mon, 31 Mar 2025 17:45:41 +0100 Subject: [PATCH 1/7] Dump state after test --- .../java/buildless-snapshot-repository/test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java/ql/integration-tests/java/buildless-snapshot-repository/test.py b/java/ql/integration-tests/java/buildless-snapshot-repository/test.py index e5e38d725ae8..7b54cceca930 100644 --- a/java/ql/integration-tests/java/buildless-snapshot-repository/test.py +++ b/java/ql/integration-tests/java/buildless-snapshot-repository/test.py @@ -13,4 +13,6 @@ def test(codeql, java): _env={"CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS_CLASSPATH_FROM_BUILD_FILES": "true"}, ) finally: + subprocess.call(["pstree"]) + subprocess.call(["netstat", "-a", "-n", "-p"]) repo_server_process.kill() From df4fc0f4fa4d81d8c12418bee6b506db03218051 Mon Sep 17 00:00:00 2001 From: Chris Smowton Date: Mon, 31 Mar 2025 18:10:20 +0100 Subject: [PATCH 2/7] Update --- .../java/buildless-snapshot-repository/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/ql/integration-tests/java/buildless-snapshot-repository/test.py b/java/ql/integration-tests/java/buildless-snapshot-repository/test.py index 7b54cceca930..925888f0d113 100644 --- a/java/ql/integration-tests/java/buildless-snapshot-repository/test.py +++ b/java/ql/integration-tests/java/buildless-snapshot-repository/test.py @@ -13,6 +13,6 @@ def test(codeql, java): _env={"CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS_CLASSPATH_FROM_BUILD_FILES": "true"}, ) finally: - subprocess.call(["pstree"]) + subprocess.call(["ps", "aux", "-ww"]) subprocess.call(["netstat", "-a", "-n", "-p"]) repo_server_process.kill() From ca0d551fd80bede348abd70faadf4451a3f014e4 Mon Sep 17 00:00:00 2001 From: Chris Smowton Date: Mon, 31 Mar 2025 18:27:02 +0100 Subject: [PATCH 3/7] Update --- .../java/buildless-snapshot-repository/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/ql/integration-tests/java/buildless-snapshot-repository/test.py b/java/ql/integration-tests/java/buildless-snapshot-repository/test.py index 925888f0d113..c6add0b6603c 100644 --- a/java/ql/integration-tests/java/buildless-snapshot-repository/test.py +++ b/java/ql/integration-tests/java/buildless-snapshot-repository/test.py @@ -14,5 +14,5 @@ def test(codeql, java): ) finally: subprocess.call(["ps", "aux", "-ww"]) - subprocess.call(["netstat", "-a", "-n", "-p"]) + subprocess.call(["netstat", "-anv"]) repo_server_process.kill() From 2538c34f253dc19b79513480756d57da74996ae8 Mon Sep 17 00:00:00 2001 From: Chris Smowton Date: Mon, 31 Mar 2025 19:06:56 +0100 Subject: [PATCH 4/7] Update --- .../java/buildless-snapshot-repository/test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java/ql/integration-tests/java/buildless-snapshot-repository/test.py b/java/ql/integration-tests/java/buildless-snapshot-repository/test.py index c6add0b6603c..48fbc557da86 100644 --- a/java/ql/integration-tests/java/buildless-snapshot-repository/test.py +++ b/java/ql/integration-tests/java/buildless-snapshot-repository/test.py @@ -15,4 +15,6 @@ def test(codeql, java): finally: subprocess.call(["ps", "aux", "-ww"]) subprocess.call(["netstat", "-anv"]) + subprocess.call(["curl", "-m", "30", "http://localhost:9427/snapshots"]) + subprocess.call(["curl", "-m", "30", "http://localhost:9427/snapshots/com/github/my/snapshot/test/snapshottest/1.0-SNAPSHOT/maven-metadata.xml"]) repo_server_process.kill() From e988575e7d2201d441bd81afb68b56824ca63b57 Mon Sep 17 00:00:00 2001 From: Chris Smowton Date: Mon, 31 Mar 2025 19:27:23 +0100 Subject: [PATCH 5/7] Update --- .../java/buildless-snapshot-repository/test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java/ql/integration-tests/java/buildless-snapshot-repository/test.py b/java/ql/integration-tests/java/buildless-snapshot-repository/test.py index 48fbc557da86..ee9910da0575 100644 --- a/java/ql/integration-tests/java/buildless-snapshot-repository/test.py +++ b/java/ql/integration-tests/java/buildless-snapshot-repository/test.py @@ -8,6 +8,8 @@ def test(codeql, java): [sys.executable, "-m", "http.server", "9427"], cwd="repo" ) try: + subprocess.call(["curl", "-m", "30", "http://localhost:9427/snapshots"]) + subprocess.call(["curl", "-m", "30", "http://localhost:9427/snapshots/com/github/my/snapshot/test/snapshottest/1.0-SNAPSHOT/maven-metadata.xml"]) codeql.database.create( extractor_option="buildless=true", _env={"CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS_CLASSPATH_FROM_BUILD_FILES": "true"}, From 869c8a50dd4598e4e9f4a8d8de64b7ea1130f13b Mon Sep 17 00:00:00 2001 From: Chris Smowton Date: Mon, 31 Mar 2025 19:41:14 +0100 Subject: [PATCH 6/7] Update --- .../java/buildless-snapshot-repository/test.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/ql/integration-tests/java/buildless-snapshot-repository/test.py b/java/ql/integration-tests/java/buildless-snapshot-repository/test.py index ee9910da0575..077a4f5ff986 100644 --- a/java/ql/integration-tests/java/buildless-snapshot-repository/test.py +++ b/java/ql/integration-tests/java/buildless-snapshot-repository/test.py @@ -1,6 +1,6 @@ import subprocess import sys - +import time def test(codeql, java): # This serves the "repo" directory on http://localhost:9427 @@ -8,6 +8,7 @@ def test(codeql, java): [sys.executable, "-m", "http.server", "9427"], cwd="repo" ) try: + time.sleep(30) subprocess.call(["curl", "-m", "30", "http://localhost:9427/snapshots"]) subprocess.call(["curl", "-m", "30", "http://localhost:9427/snapshots/com/github/my/snapshot/test/snapshottest/1.0-SNAPSHOT/maven-metadata.xml"]) codeql.database.create( From e5cc6a57aa3f836c332b56ac0c23c8da02d21d6f Mon Sep 17 00:00:00 2001 From: Chris Smowton Date: Mon, 31 Mar 2025 19:58:11 +0100 Subject: [PATCH 7/7] Update --- .../java/buildless-snapshot-repository/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/ql/integration-tests/java/buildless-snapshot-repository/test.py b/java/ql/integration-tests/java/buildless-snapshot-repository/test.py index 077a4f5ff986..4b2835d389a5 100644 --- a/java/ql/integration-tests/java/buildless-snapshot-repository/test.py +++ b/java/ql/integration-tests/java/buildless-snapshot-repository/test.py @@ -8,7 +8,7 @@ def test(codeql, java): [sys.executable, "-m", "http.server", "9427"], cwd="repo" ) try: - time.sleep(30) + time.sleep(300) subprocess.call(["curl", "-m", "30", "http://localhost:9427/snapshots"]) subprocess.call(["curl", "-m", "30", "http://localhost:9427/snapshots/com/github/my/snapshot/test/snapshottest/1.0-SNAPSHOT/maven-metadata.xml"]) codeql.database.create(