test(integration): re-enable some tests by renaming their filename (#…

…9906) Co-authored-by: Michael Martin <flrgh@protonmail.com>
Kong · Dec 13, 2022 · 2b8d444 · 2b8d444 · khcp-gha-bot · Dec 13, 2022
1 parent deede05
commit 2b8d444
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 244 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -140,6 +140,10 @@ jobs:
           eval `luarocks path`
           scripts/validate-rockspec
 
+    - name: Check spec file misspelling
+      run: |
+          scripts/check_spec_files_spelling.sh
+
     - name: Unit tests
       run: |
           eval `luarocks path`

diff --git a/scripts/check_spec_files_spelling.sh b/scripts/check_spec_files_spelling.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+set -e
+
+function red() {
+    echo -e "\033[1;31m$*\033[0m"
+}
+
+readarray -t FOUND < \
+<(
+  git ls-files 'spec/[0-9]**.lua' \
+  | grep -vE \
+    -e '_spec.lua$' \
+    -f spec/on_demand_specs
+)
+
+if (( ${#FOUND[@]} > 0 )); then
+  echo
+  red "----------------------------------------------------------------"
+  echo "Found some files in spec directory that do not have the _spec suffix, please check if you're misspelling them. If there is an exception, please add the coressponding files(or their path regexes) into the whitelist spec/on_demand_specs."
+  echo
+  echo "Possible misspelling file list:"
+  echo
+  printf "%s\n" "${FOUND[@]}"
+  red "----------------------------------------------------------------"
+  exit 1
+fi
diff --git a/spec/01-unit/19-hybrid/04-negotiation.lua → ...01-unit/19-hybrid/04-negotiation_spec.lua b/spec/01-unit/19-hybrid/04-negotiation.lua → ...01-unit/19-hybrid/04-negotiation_spec.lua
diff --git a/...egration/04-admin_api/12-plugins-conf.lua → ...ion/04-admin_api/12-plugins-conf_spec.lua b/...egration/04-admin_api/12-plugins-conf.lua → ...ion/04-admin_api/12-plugins-conf_spec.lua
@@ -105,8 +105,8 @@ describe("Plugins conf property" , function()
       local body = assert.res_status(200 , res)
       local json = assert(cjson.decode(body))
       assert.equal(2, tablex.size(json.plugins.available_on_server))
-      assert.True(json.plugins.available_on_server["key-auth"])
-      assert.True(json.plugins.available_on_server["basic-auth"])
+      assert.truthy(json.plugins.available_on_server["key-auth"])
+      assert.truthy(json.plugins.available_on_server["basic-auth"])
     end)
   end)
 

diff --git a/...tion/04-admin_api/13-plugin-endpoints.lua → ...04-admin_api/13-plugin-endpoints_spec.lua b/...tion/04-admin_api/13-plugin-endpoints.lua → ...04-admin_api/13-plugin-endpoints_spec.lua
diff --git a/spec/02-integration/04-admin_api/18-worker-events.lua b/spec/02-integration/04-admin_api/18-worker-events.lua
diff --git a/...gration/09-hybrid_mode/08-lazy_export.lua → ...on/09-hybrid_mode/08-lazy_export_spec.lua b/...gration/09-hybrid_mode/08-lazy_export.lua → ...on/09-hybrid_mode/08-lazy_export_spec.lua
diff --git a/...ation/11-dbless/03-config_persistence.lua → .../11-dbless/03-config_persistence_spec.lua b/...ation/11-dbless/03-config_persistence.lua → .../11-dbless/03-config_persistence_spec.lua
diff --git a/.../26-prometheus/06-hybrid-mode_metrics.lua → ...rometheus/06-hybrid-mode_metrics_spec.lua b/.../26-prometheus/06-hybrid-mode_metrics.lua → ...rometheus/06-hybrid-mode_metrics_spec.lua
diff --git a/spec/on_demand_specs b/spec/on_demand_specs
@@ -0,0 +1,4 @@
+# Whitelist regexes representing file paths that will not be tested during running busted CI
+spec/02-integration/05-proxy/10-balancer/05-stress.lua
+spec/03-plugins/16-jwt/fixtures.lua
+spec/04-perf/.*