Skip to content

Commit

Permalink
Merge pull request #2788 from gophercloud/bp-v1-6f31881-7bec78e
Browse files Browse the repository at this point in the history
[v1] Make acceptance tests internal
  • Loading branch information
EmilienM committed Sep 22, 2023
2 parents b024625 + 39c2b02 commit d462f04
Show file tree
Hide file tree
Showing 290 changed files with 500 additions and 500 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/functional-basic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
run: ./script/acceptancetest
env:
DEVSTACK_PATH: ${{ github.workspace }}/devstack
ACCEPTANCE_TESTS_FILTER: '^acceptance/openstack$'
ACCEPTANCE_TESTS_FILTER: '^internal/acceptance/openstack$'
OS_BRANCH: ${{ matrix.openstack_version }}
- name: Generate logs on failure
run: ./script/collectlogs
Expand Down
2 changes: 1 addition & 1 deletion acceptance/README.md → internal/acceptance/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Alternatively, add the following to your `.bashrc`:
gophercloudtest() {
if [[ -n $1 ]] && [[ -n $2 ]]; then
pushd $GOPATH/src/github.com/gophercloud/gophercloud
go test -v -tags "fixtures acceptance" -run "$1" github.com/gophercloud/gophercloud/acceptance/openstack/$2 | tee ~/gophercloud.log
go test -v -tags "fixtures acceptance" -run "$1" github.com/gophercloud/gophercloud/internal/acceptance/openstack/$2 | tee ~/gophercloud.log
popd
fi
}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
)

func TestIsCurrentAbove(t *testing.T) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package httpbasic
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
v1 "github.com/gophercloud/gophercloud/acceptance/openstack/baremetal/v1"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
v1 "github.com/gophercloud/gophercloud/internal/acceptance/openstack/baremetal/v1"
"github.com/gophercloud/gophercloud/openstack/baremetal/v1/allocations"
"github.com/gophercloud/gophercloud/pagination"
th "github.com/gophercloud/gophercloud/testhelper"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package httpbasic
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
v1 "github.com/gophercloud/gophercloud/acceptance/openstack/baremetal/v1"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
v1 "github.com/gophercloud/gophercloud/internal/acceptance/openstack/baremetal/v1"
"github.com/gophercloud/gophercloud/openstack/baremetal/v1/nodes"
"github.com/gophercloud/gophercloud/pagination"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package httpbasic
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
v1 "github.com/gophercloud/gophercloud/acceptance/openstack/baremetal/v1"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
v1 "github.com/gophercloud/gophercloud/internal/acceptance/openstack/baremetal/v1"
"github.com/gophercloud/gophercloud/openstack/baremetal/v1/ports"
"github.com/gophercloud/gophercloud/pagination"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package noauth
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
v1 "github.com/gophercloud/gophercloud/acceptance/openstack/baremetal/v1"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
v1 "github.com/gophercloud/gophercloud/internal/acceptance/openstack/baremetal/v1"
"github.com/gophercloud/gophercloud/openstack/baremetal/v1/allocations"
"github.com/gophercloud/gophercloud/pagination"
th "github.com/gophercloud/gophercloud/testhelper"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package noauth
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
v1 "github.com/gophercloud/gophercloud/acceptance/openstack/baremetal/v1"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
v1 "github.com/gophercloud/gophercloud/internal/acceptance/openstack/baremetal/v1"
"github.com/gophercloud/gophercloud/openstack/baremetal/v1/nodes"
"github.com/gophercloud/gophercloud/pagination"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package noauth
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
v1 "github.com/gophercloud/gophercloud/acceptance/openstack/baremetal/v1"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
v1 "github.com/gophercloud/gophercloud/internal/acceptance/openstack/baremetal/v1"
"github.com/gophercloud/gophercloud/openstack/baremetal/v1/ports"
"github.com/gophercloud/gophercloud/pagination"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package v1
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/openstack/baremetal/v1/allocations"
"github.com/gophercloud/gophercloud/pagination"
th "github.com/gophercloud/gophercloud/testhelper"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"

"github.com/gophercloud/gophercloud"
"github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/baremetal/v1/allocations"
"github.com/gophercloud/gophercloud/openstack/baremetal/v1/nodes"
"github.com/gophercloud/gophercloud/openstack/baremetal/v1/ports"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package v1
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
"github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/baremetal/v1/conductors"
"github.com/gophercloud/gophercloud/pagination"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package v1
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/openstack/baremetal/v1/nodes"
"github.com/gophercloud/gophercloud/pagination"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package v1
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/openstack/baremetal/v1/ports"
"github.com/gophercloud/gophercloud/pagination"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package blockstorage
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
"github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/blockstorage/apiversions"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ package extensions
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/backups"

blockstorage "github.com/gophercloud/gophercloud/acceptance/openstack/blockstorage/v3"
blockstorage "github.com/gophercloud/gophercloud/internal/acceptance/openstack/blockstorage/v3"
th "github.com/gophercloud/gophercloud/testhelper"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"

"github.com/gophercloud/gophercloud"
"github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/backups"
"github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/volumeactions"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v2/volumes"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package extensions
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
"github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/limits"
th "github.com/gophercloud/gophercloud/testhelper"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package extensions
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
"github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/schedulerhints"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes"
th "github.com/gophercloud/gophercloud/testhelper"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package extensions
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
"github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/schedulerstats"
th "github.com/gophercloud/gophercloud/testhelper"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package extensions
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
"github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/services"
th "github.com/gophercloud/gophercloud/testhelper"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ package extensions
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
blockstorage "github.com/gophercloud/gophercloud/acceptance/openstack/blockstorage/v2"
blockstorageV3 "github.com/gophercloud/gophercloud/acceptance/openstack/blockstorage/v3"
compute "github.com/gophercloud/gophercloud/acceptance/openstack/compute/v2"
"github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
blockstorage "github.com/gophercloud/gophercloud/internal/acceptance/openstack/blockstorage/v2"
blockstorageV3 "github.com/gophercloud/gophercloud/internal/acceptance/openstack/blockstorage/v3"
compute "github.com/gophercloud/gophercloud/internal/acceptance/openstack/compute/v2"
"github.com/gophercloud/gophercloud/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v2/volumes"
th "github.com/gophercloud/gophercloud/testhelper"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package extensions
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
blockstorage "github.com/gophercloud/gophercloud/acceptance/openstack/blockstorage/v3"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
blockstorage "github.com/gophercloud/gophercloud/internal/acceptance/openstack/blockstorage/v3"
"github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/volumetenants"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes"
th "github.com/gophercloud/gophercloud/testhelper"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"testing"

"github.com/gophercloud/gophercloud"
"github.com/gophercloud/gophercloud/acceptance/clients"
"github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v3/snapshots"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package noauth
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
"github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v3/snapshots"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package noauth
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
"github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"

"github.com/gophercloud/gophercloud"
"github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v1/snapshots"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v1/volumes"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v1/volumetypes"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package v1
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
"github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v1/snapshots"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package v1
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
"github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v1/volumes"
th "github.com/gophercloud/gophercloud/testhelper"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package v1
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
"github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v1/volumetypes"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"testing"

"github.com/gophercloud/gophercloud"
"github.com/gophercloud/gophercloud/acceptance/clients"
"github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v2/snapshots"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v2/volumes"
th "github.com/gophercloud/gophercloud/testhelper"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package v2
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
"github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v2/snapshots"
th "github.com/gophercloud/gophercloud/testhelper"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package v2
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
"github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/volumeactions"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v2/snapshots"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v2/volumes"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"

"github.com/gophercloud/gophercloud"
"github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v3/qos"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v3/snapshots"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package v3
import (
"testing"

"github.com/gophercloud/gophercloud/acceptance/clients"
"github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v3/qos"
"github.com/gophercloud/gophercloud/pagination"
th "github.com/gophercloud/gophercloud/testhelper"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"testing"

"github.com/gophercloud/gophercloud"
"github.com/gophercloud/gophercloud/acceptance/clients"
"github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/quotasets"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumetypes"
th "github.com/gophercloud/gophercloud/testhelper"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"testing"

"github.com/gophercloud/gophercloud"
"github.com/gophercloud/gophercloud/acceptance/clients"
"github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/internal/acceptance/clients"
"github.com/gophercloud/gophercloud/internal/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v3/snapshots"
"github.com/gophercloud/gophercloud/pagination"
th "github.com/gophercloud/gophercloud/testhelper"
Expand Down
Loading

0 comments on commit d462f04

Please sign in to comment.