Refactor how we determine TEST_LIGHTSPEED_URL

.config/dictionary.txt

@@ -108,6 +108,7 @@ gnalawad
 groovylint
 haaaad
 hbenl
+hostnames
 hostvars
 hotfixes
 iam

.envrc

@@ -9,6 +9,17 @@ export HOSTNAME="${HOSTNAME:-${HOST:-$(hostname)}}"
 # for build and testing purposes.
 export VIRTUAL_ENV="${HOME}/.local/share/virtualenvs/vsa"
 
+# determine which TEST_LIGHTSPEED_URL value to use, as on macos we need a
+# different value than on linux due to how ipv4/ipv6 hostnames are resolved.
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    TEST_LIGHTSPEED_URL='http://127.0.0.1:3000'
+else
+    TEST_LIGHTSPEED_URL='http://ip6-localhost:3000'
+fi
+export TEST_LIGHTSPEED_URL
+
+
 # Activate virtualenv (creates it if needed)
 layout python
 source_up 2>/dev/null || true

.github/workflows/ci.yaml

@@ -240,7 +240,7 @@ jobs:
           #
           # Once the axios library starts supporting URLs that contain ipv6 addresses, we will be able to use
           # http://[::1]:3000 both on Linux and MacOS to get rid of the following conditional statement.
-          TEST_LIGHTSPEED_URL: "${{ contains(matrix.name, 'macos') && 'http://127.0.0.1:3000' || 'http://ip6-localhost:3000' }}"
+          # TEST_LIGHTSPEED_URL: "${{ contains(matrix.name, 'macos') && 'http://127.0.0.1:3000' || 'http://ip6-localhost:3000' }}"
 
           # Set environment variables using matrix properties.
           SKIP_PODMAN: "${{ matrix.env.SKIP_PODMAN || '0' }}"

Taskfile.yml

@@ -138,7 +138,6 @@ tasks:
       - tools/dirty.sh
     interactive: true
   test-e2e:
-    desc: Run e2e tests {{.XVFB}}
     cmds:
       - task: package
       - $VIRTUAL_ENV/bin/python3 --version
@@ -175,6 +174,8 @@ tasks:
       - ./tools/package.sh
       - src/**/*
       - test/**/*
+      - package/*/src
+      - package/*/test
     generates:
       - "*.vsix"
     cmds:

package.json

@@ -842,7 +842,7 @@
     "_test-ui": "extest get-vscode -c ${CODE_VERSION} -s out/test-resources && extest get-chromedriver -c ${CODE_VERSION} -s out/test-resources && extest install-vsix -f ansible-*.vsix -e out/ext -s out/test-resources && extest install-from-marketplace redhat.vscode-yaml ms-python.python -e out/ext -s out/test-resources && extest run-tests -s out/test-resources -e out/ext --code_settings test/testFixtures/settings.json out/client/test/ui-test/allTestsSuite.js",
     "test-ui-current": "CODE_VERSION='max' yarn _test-ui",
     "test-ui-oldest": "CODE_VERSION='min' yarn _test-ui",
-    "test-ui-with-mock-lightspeed-server": "TEST_LIGHTSPEED_URL='http://127.0.0.1:3000' ./tools/run-ui-test-with-mock-lightspeed-server.sh",
+    "test-ui-with-mock-lightspeed-server": "./tools/run-ui-test-with-mock-lightspeed-server.sh",
     "vscode-prepublish": "yarn run webpack",
     "watch": "tsc -b -w",
     "watch-server": "tsc -p ../ansible-language-server --outDir out/server -w",
@@ -859,7 +859,7 @@
     "mock-lightspeed-server": "DEBUG='express:*' node ./out/client/test/mockLightspeedServer/server.js 2> out/log/express.log",
     "kill-mock-lightspeed-server": "pkill -f mockLightspeedServer/server.js",
     "_coverage-all": "./tools/coverage-all.sh",
-    "coverage-all": "TEST_LIGHTSPEED_URL='http://127.0.0.1:3000' yarn _coverage-all",
+    "coverage-all": "yarn _coverage-all",
     "als-compile": "yarn workspace @ansible/ansible-language-server compile"
   },
   "version": "24.4.0",

tools/coverage-all.sh

@@ -1,13 +1,7 @@
 #!/bin/bash
 
-# If TEST_LIGHTSPEED_URL is not defined, set a URL with the ipv6 callback hostname,
-# which is available in the GitHub Actions Linux environment.
-if [[ -z "${TEST_LIGHTSPEED_URL}" ]]; then
-  TEST_LIGHTSPEED_URL="http://ip6-localhost:3000"
-fi
-
 # Start the mock Lightspeed server and run e2e tests with code coverage enabled.
 npx start-server-and-test \
-    "TEST_LIGHTSPEED_URL=${TEST_LIGHTSPEED_URL} yarn mock-lightspeed-server" \
+    "yarn mock-lightspeed-server" \
     "${TEST_LIGHTSPEED_URL}" \
-    "TEST_LIGHTSPEED_ACCESS_TOKEN=dummy TEST_LIGHTSPEED_URL=${TEST_LIGHTSPEED_URL} yarn coverage-e2e"
+    "TEST_LIGHTSPEED_ACCESS_TOKEN=dummy yarn coverage-e2e"

tools/run-ui-test-with-mock-lightspeed-server.sh

@@ -1,13 +1,7 @@
 #!/bin/bash
 
-# If TEST_LIGHTSPEED_URL is not defined, set a URL with the ipv6 callback hostname,
-# which is available in the GitHub Actions Linux environment.
-if [[ -z "${TEST_LIGHTSPEED_URL}" ]]; then
-  TEST_LIGHTSPEED_URL="http://ip6-localhost:3000"
-fi
-
 # Start the mock Lightspeed server and run UI tests with the new VS Code
 npx start-server-and-test \
-    "TEST_LIGHTSPEED_URL=${TEST_LIGHTSPEED_URL} yarn mock-lightspeed-server" \
+    "yarn mock-lightspeed-server" \
     "${TEST_LIGHTSPEED_URL}" \
-    "TEST_LIGHTSPEED_ACCESS_TOKEN=dummy TEST_LIGHTSPEED_URL=${TEST_LIGHTSPEED_URL} yarn test-ui-current"
+    "TEST_LIGHTSPEED_ACCESS_TOKEN=dummy yarn test-ui-current"