From 0abcaa80261b7aa6c1abfaa0a9f36203b74c6f40 Mon Sep 17 00:00:00 2001
From: chrislovecnm <clove@cnmconsulting.net>
Date: Tue, 3 Oct 2017 13:38:13 -0600
Subject: [PATCH] renaming cf integration test folder

---
 cmd/kops/integration_test.go                                  | 4 +---
 .../cloudformation.json                                       | 0
 .../cloudformation.json.extracted.yaml                        | 0
 .../{cloudformation => minimal-cloudformation}/id_rsa.pub     | 0
 .../in-v1alpha2.yaml                                          | 0
 .../{cloudformation => minimal-cloudformation}/kubernetes.tf  | 0
 6 files changed, 1 insertion(+), 3 deletions(-)
 rename tests/integration/{cloudformation => minimal-cloudformation}/cloudformation.json (100%)
 rename tests/integration/{cloudformation => minimal-cloudformation}/cloudformation.json.extracted.yaml (100%)
 rename tests/integration/{cloudformation => minimal-cloudformation}/id_rsa.pub (100%)
 rename tests/integration/{cloudformation => minimal-cloudformation}/in-v1alpha2.yaml (100%)
 rename tests/integration/{cloudformation => minimal-cloudformation}/kubernetes.tf (100%)

diff --git a/cmd/kops/integration_test.go b/cmd/kops/integration_test.go
index 6c03d77b6b..90f82b0d31 100644
--- a/cmd/kops/integration_test.go
+++ b/cmd/kops/integration_test.go
@@ -71,9 +71,7 @@ func TestComplex(t *testing.T) {
 
 // TestMinimalCloudformation runs the test on a minimum configuration, similar to kops create cluster minimal.example.com --zones us-west-1a
 func TestMinimalCloudformation(t *testing.T) {
-	//runTestCloudformation(t, "minimal.example.com", "../../tests/integration/minimal", "v1alpha0", false)
-	//runTestCloudformation(t, "minimal.example.com", "../../tests/integration/minimal", "v1alpha1", false)
-	runTestCloudformation(t, "minimal.example.com", "../../tests/integration/cloudformation", "v1alpha2", false)
+	runTestCloudformation(t, "minimal.example.com", "../../tests/integration/minimal-cloudformation", "v1alpha2", false)
 }
 
 // TestMinimal_141 runs the test on a configuration from 1.4.1 release
diff --git a/tests/integration/cloudformation/cloudformation.json b/tests/integration/minimal-cloudformation/cloudformation.json
similarity index 100%
rename from tests/integration/cloudformation/cloudformation.json
rename to tests/integration/minimal-cloudformation/cloudformation.json
diff --git a/tests/integration/cloudformation/cloudformation.json.extracted.yaml b/tests/integration/minimal-cloudformation/cloudformation.json.extracted.yaml
similarity index 100%
rename from tests/integration/cloudformation/cloudformation.json.extracted.yaml
rename to tests/integration/minimal-cloudformation/cloudformation.json.extracted.yaml
diff --git a/tests/integration/cloudformation/id_rsa.pub b/tests/integration/minimal-cloudformation/id_rsa.pub
similarity index 100%
rename from tests/integration/cloudformation/id_rsa.pub
rename to tests/integration/minimal-cloudformation/id_rsa.pub
diff --git a/tests/integration/cloudformation/in-v1alpha2.yaml b/tests/integration/minimal-cloudformation/in-v1alpha2.yaml
similarity index 100%
rename from tests/integration/cloudformation/in-v1alpha2.yaml
rename to tests/integration/minimal-cloudformation/in-v1alpha2.yaml
diff --git a/tests/integration/cloudformation/kubernetes.tf b/tests/integration/minimal-cloudformation/kubernetes.tf
similarity index 100%
rename from tests/integration/cloudformation/kubernetes.tf
rename to tests/integration/minimal-cloudformation/kubernetes.tf