From a2fe87e4978ef4c6b77f193b21ebe8de9262cb42 Mon Sep 17 00:00:00 2001 From: Manjunath A Kumatagi Date: Thu, 14 Apr 2022 10:31:29 +0530 Subject: [PATCH] Fix the import path in the test files --- .../instance/ibm-pi-cloud_connection_integration_test.go | 2 +- clients/instance/ibm-pi-dhcp_integration_test.go | 2 +- clients/instance/ibm-pi-image_integration_test.go | 2 +- clients/instance/ibm-pi-instance_integration_test.go | 2 +- clients/instance/ibm-pi-key_integration_test.go | 2 +- clients/instance/ibm-pi-network_integration_test.go | 2 +- clients/instance/ibm-pi-snapshot_integration_test.go | 2 +- .../instance/ibm-pi-storage_capacity_integration_test.go | 2 +- clients/instance/ibm-pi-volume_integration_test.go | 2 +- clients/instance/ibm-pi-vpn_integration_test.go | 2 +- go.mod | 8 +------- internal/testutils/go.mod | 3 --- 12 files changed, 11 insertions(+), 20 deletions(-) delete mode 100644 internal/testutils/go.mod diff --git a/clients/instance/ibm-pi-cloud_connection_integration_test.go b/clients/instance/ibm-pi-cloud_connection_integration_test.go index a028cf87..f3b7ee89 100644 --- a/clients/instance/ibm-pi-cloud_connection_integration_test.go +++ b/clients/instance/ibm-pi-cloud_connection_integration_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - utl "internal/testutils" + utl "github.com/IBM-Cloud/power-go-client/internal/testutils" client "github.com/IBM-Cloud/power-go-client/clients/instance" "github.com/IBM-Cloud/power-go-client/power/models" diff --git a/clients/instance/ibm-pi-dhcp_integration_test.go b/clients/instance/ibm-pi-dhcp_integration_test.go index 312f973a..8ef67b05 100644 --- a/clients/instance/ibm-pi-dhcp_integration_test.go +++ b/clients/instance/ibm-pi-dhcp_integration_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - utl "internal/testutils" + utl "github.com/IBM-Cloud/power-go-client/internal/testutils" client "github.com/IBM-Cloud/power-go-client/clients/instance" "github.com/IBM-Cloud/power-go-client/power/models" diff --git a/clients/instance/ibm-pi-image_integration_test.go b/clients/instance/ibm-pi-image_integration_test.go index 699487f1..4e4e6f4e 100644 --- a/clients/instance/ibm-pi-image_integration_test.go +++ b/clients/instance/ibm-pi-image_integration_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - utl "internal/testutils" + utl "github.com/IBM-Cloud/power-go-client/internal/testutils" client "github.com/IBM-Cloud/power-go-client/clients/instance" "github.com/stretchr/testify/require" diff --git a/clients/instance/ibm-pi-instance_integration_test.go b/clients/instance/ibm-pi-instance_integration_test.go index d1e25141..c55a3c50 100644 --- a/clients/instance/ibm-pi-instance_integration_test.go +++ b/clients/instance/ibm-pi-instance_integration_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - utl "internal/testutils" + utl "github.com/IBM-Cloud/power-go-client/internal/testutils" client "github.com/IBM-Cloud/power-go-client/clients/instance" "github.com/IBM-Cloud/power-go-client/power/models" diff --git a/clients/instance/ibm-pi-key_integration_test.go b/clients/instance/ibm-pi-key_integration_test.go index 269bc726..eb53df43 100644 --- a/clients/instance/ibm-pi-key_integration_test.go +++ b/clients/instance/ibm-pi-key_integration_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - utl "internal/testutils" + utl "github.com/IBM-Cloud/power-go-client/internal/testutils" client "github.com/IBM-Cloud/power-go-client/clients/instance" "github.com/IBM-Cloud/power-go-client/power/models" diff --git a/clients/instance/ibm-pi-network_integration_test.go b/clients/instance/ibm-pi-network_integration_test.go index 3f8640e0..ed005fef 100644 --- a/clients/instance/ibm-pi-network_integration_test.go +++ b/clients/instance/ibm-pi-network_integration_test.go @@ -7,7 +7,7 @@ import ( "strconv" "testing" - utl "internal/testutils" + utl "github.com/IBM-Cloud/power-go-client/internal/testutils" "github.com/apparentlymart/go-cidr/cidr" "github.com/stretchr/testify/require" diff --git a/clients/instance/ibm-pi-snapshot_integration_test.go b/clients/instance/ibm-pi-snapshot_integration_test.go index ddef5a0c..5ee74ee3 100644 --- a/clients/instance/ibm-pi-snapshot_integration_test.go +++ b/clients/instance/ibm-pi-snapshot_integration_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - utl "internal/testutils" + utl "github.com/IBM-Cloud/power-go-client/internal/testutils" client "github.com/IBM-Cloud/power-go-client/clients/instance" "github.com/IBM-Cloud/power-go-client/power/models" diff --git a/clients/instance/ibm-pi-storage_capacity_integration_test.go b/clients/instance/ibm-pi-storage_capacity_integration_test.go index aaf0ab45..fe5d05f5 100644 --- a/clients/instance/ibm-pi-storage_capacity_integration_test.go +++ b/clients/instance/ibm-pi-storage_capacity_integration_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - utl "internal/testutils" + utl "github.com/IBM-Cloud/power-go-client/internal/testutils" client "github.com/IBM-Cloud/power-go-client/clients/instance" "github.com/stretchr/testify/require" diff --git a/clients/instance/ibm-pi-volume_integration_test.go b/clients/instance/ibm-pi-volume_integration_test.go index 174016c0..50890a36 100644 --- a/clients/instance/ibm-pi-volume_integration_test.go +++ b/clients/instance/ibm-pi-volume_integration_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - utl "internal/testutils" + utl "github.com/IBM-Cloud/power-go-client/internal/testutils" client "github.com/IBM-Cloud/power-go-client/clients/instance" "github.com/IBM-Cloud/power-go-client/power/models" diff --git a/clients/instance/ibm-pi-vpn_integration_test.go b/clients/instance/ibm-pi-vpn_integration_test.go index 2c35e86e..01e9891b 100644 --- a/clients/instance/ibm-pi-vpn_integration_test.go +++ b/clients/instance/ibm-pi-vpn_integration_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - utl "internal/testutils" + utl "github.com/IBM-Cloud/power-go-client/internal/testutils" client "github.com/IBM-Cloud/power-go-client/clients/instance" "github.com/IBM-Cloud/power-go-client/power/models" diff --git a/go.mod b/go.mod index 7ee76b38..6b6e843c 100644 --- a/go.mod +++ b/go.mod @@ -10,6 +10,7 @@ require ( github.com/go-openapi/strfmt v0.21.2 github.com/go-openapi/swag v0.21.1 github.com/go-openapi/validate v0.20.3 + github.com/stretchr/testify v1.7.0 ) require ( @@ -41,10 +42,3 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect ) - -require ( - github.com/stretchr/testify v1.7.0 - internal/testutils v1.0.0 -) - -replace internal/testutils => ./internal/testutils diff --git a/internal/testutils/go.mod b/internal/testutils/go.mod deleted file mode 100644 index ef29f468..00000000 --- a/internal/testutils/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module testutils - -go 1.17