Merge pull request kubernetes-sigs#78 from leakingtapan/rename

Rename e2e test to be integ test
leakingtapan · Oct 25, 2018 · 79dfa82 · 79dfa82
2 parents a3930a3 + 6e71a45
commit 79dfa82
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -28,10 +28,10 @@ test:
 test-sanity:
 	go test -v ./tests/sanity/...
 
-.PHONY: test-e2e
-test-e2e:
-	go test -c ./tests/e2e/... -o bin/e2e.test && \
-	sudo -E bin/e2e.test -ginkgo.v
+.PHONY: test-integration
+test-integration:
+	go test -c ./tests/integration/... -o bin/integration.test && \
+	sudo -E bin/integration.test -ginkgo.v
 
 .PHONY: image
 image:

diff --git a/hack/verify-all → hack/verify-all.sh b/hack/verify-all → hack/verify-all.sh
diff --git a/pkg/driver/controller.go b/pkg/driver/controller.go
@@ -298,7 +298,7 @@ func newCreateVolumeResponse(disk *cloud.Disk) *csi.CreateVolumeResponse {
 				"fsType": disk.FsType,
 			},
 			AccessibleTopology: []*csi.Topology{
-				&csi.Topology{
+				{
 					Segments: map[string]string{topologyKey: disk.AvailabilityZone},
 				},
 			},

diff --git a/pkg/driver/controller_test.go b/pkg/driver/controller_test.go
@@ -294,12 +294,12 @@ func TestPickAvailabilityZone(t *testing.T) {
 			name: "Pick from preferred",
 			requirement: &csi.TopologyRequirement{
 				Requisite: []*csi.Topology{
-					&csi.Topology{
+					{
 						Segments: map[string]string{topologyKey: expZone},
 					},
 				},
 				Preferred: []*csi.Topology{
-					&csi.Topology{
+					{
 						Segments: map[string]string{topologyKey: expZone},
 					},
 				},
@@ -310,7 +310,7 @@ func TestPickAvailabilityZone(t *testing.T) {
 			name: "Pick from requisite",
 			requirement: &csi.TopologyRequirement{
 				Requisite: []*csi.Topology{
-					&csi.Topology{
+					{
 						Segments: map[string]string{topologyKey: expZone},
 					},
 				},
@@ -320,8 +320,8 @@ func TestPickAvailabilityZone(t *testing.T) {
 		{
 			name: "Pick from empty topology",
 			requirement: &csi.TopologyRequirement{
-				Preferred: []*csi.Topology{&csi.Topology{}},
-				Requisite: []*csi.Topology{&csi.Topology{}},
+				Preferred: []*csi.Topology{{}},
+				Requisite: []*csi.Topology{{}},
 			},
 			expZone: "",
 		},

diff --git a/tests/e2e/e2e_test.go → tests/integration/integration_test.go b/tests/e2e/e2e_test.go → tests/integration/integration_test.go
@@ -12,7 +12,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package e2e
+package integration
 
 import (
 	"context"
@@ -53,7 +53,7 @@ var _ = Describe("EBS CSI Driver", func() {
 
 		r1 := rand.New(rand.NewSource(time.Now().UnixNano()))
 		req := &csi.CreateVolumeRequest{
-			Name:               fmt.Sprintf("volume-name-e2e-test-%d", r1.Uint64()),
+			Name:               fmt.Sprintf("volume-name-integration-test-%d", r1.Uint64()),
 			CapacityRange:      stdCapRange,
 			VolumeCapabilities: stdVolCap,
 			Parameters:         nil,

diff --git a/tests/e2e/setup_test.go → tests/integration/setup_test.go b/tests/e2e/setup_test.go → tests/integration/setup_test.go
@@ -12,7 +12,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package e2e
+package integration
 
 import (
 	"flag"
@@ -46,10 +46,10 @@ var (
 	ebs       cloud.Cloud
 )
 
-func TestE2E(t *testing.T) {
+func TestIntegration(t *testing.T) {
 	flag.Parse()
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "AWS EBS CSI Driver Tests")
+	RunSpecs(t, "AWS EBS CSI Driver Integration Tests")
 }
 
 var _ = BeforeSuite(func() {