Merge pull request #2896 from gophercloud/revert-2891-t

EmilienM · web-flow · commit 9f2975448617 · 2024-02-05T10:11:53.000-05:00
Revert "test: Restructure actions"
diff --git a/.github/workflows/go-fmt.yaml b/.github/workflows/go-fmt.yaml
diff --git a/.github/workflows/go-vet.yaml b/.github/workflows/go-vet.yaml
diff --git a/.github/workflows/gomod.yml b/.github/workflows/gomod.yml
@@ -6,12 +6,9 @@ permissions:
 jobs:
   test:
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
           go-version: '1'
-
-      - run: |
-          if [ $(go mod tidy && git diff | wc -l) -gt 0 ]; then git diff && exit 1; fi
+      - run: if [ $(go mod tidy && git diff | wc -l) -gt 0 ]; then git diff && exit 1; fi
diff --git a/.github/workflows/reauth-retests.yaml b/.github/workflows/reauth-retests.yaml
@@ -7,9 +7,10 @@ jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         go-version:
-          - '1'
+          - "1"
 
     steps:
       - name: Setup Go ${{ matrix.go-version }}
@@ -21,4 +22,4 @@ jobs:
 
       - name: Run reauth retests
         run: |
-          go test -v -race -count=5 ./testing
+          ./script/unittest
diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -1,5 +1,5 @@
 on: [push, pull_request]
-name: Unit tests
+name: Unit Testing
 permissions:
   contents: read
 
@@ -13,20 +13,32 @@ jobs:
       fail-fast: false
       matrix:
         go-version:
-          - '1.21'
-          - '1'
+          - "1.21"
+          - "1"
+
+    env:
+      GO111MODULE: "on"
 
     steps:
-      - uses: actions/checkout@v4
       - name: Setup Go ${{ matrix.go-version }}
         uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go-version }}
 
+      - uses: actions/checkout@v4
 
       - name: Setup environment
         run: |
+          # Changing into a different directory to avoid polluting go.sum with "go get"
+          cd "$(mktemp -d)"
+          go mod init unit_tests
+
           go install github.com/wadey/gocovmerge@master
+          go install golang.org/x/tools/cmd/goimports@latest
+
+      - name: Run go vet
+        run: |
+          go vet ./...
 
       - name: Run unit tests
         run: |
diff --git a/script/format b/script/format
@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+goimports="goimports"
+
+find_files() {
+  find . -not \( \
+      \( \
+        -wholename './output' \
+        -o -wholename './_output' \
+        -o -wholename './_gopath' \
+        -o -wholename './release' \
+        -o -wholename './target' \
+        -o -wholename '*/third_party/*' \
+        -o -wholename '*/vendor/*' \
+      \) -prune \
+    \) -name '*.go'
+}
+
+ignore_files=(
+  "./openstack/compute/v2/extensions/quotasets/testing/fixtures.go"
+  "./openstack/networking/v2/extensions/vpnaas/ikepolicies/testing/requests_test.go"
+)
+
+bad_files=$(find_files | xargs ${goimports} -l)
+
+final_files=()
+for bad_file in $bad_files; do
+  found=
+  for ignore_file in "${ignore_files[@]}"; do
+    [[ "${bad_file}" == "${ignore_file}" ]] && { found=1; break; }
+  done
+  [[ -n $found ]] || final_files+=("$bad_file")
+done
+
+if [[ "${#final_files[@]}" -gt 0 ]]; then
+  diff=$(echo "${final_files[@]}" | xargs ${goimports} -d -e 2>&1)
+  if [[ -n "${diff}" ]]; then
+    echo "${diff}"
+    exit 1
+  fi
+fi
diff --git a/script/unittest b/script/unittest
@@ -0,0 +1,7 @@
+#!/bin/bash
+#
+# Run the unit tests.
+
+# Do extra rounds of testing to help identify reauth concurrency issues.
+# All other packages are tested in the `coverage` tests.
+go test -v -race -count=5 ./testing
