chore(tests/integration): vendor json library and adjust indentation

deis · Jul 22, 2014 · 5814719 · 5814719
1 parent 2eb9688
commit 5814719
Show file tree

Hide file tree

Showing 9 changed files with 738 additions and 31 deletions.
diff --git a/integration/apps_test.go b/integration/apps_test.go
@@ -0,0 +1,36 @@
+package verbose
+
+import (
+	"fmt"
+	"github.com/deis/deis/tests/integration-utils"
+	"testing"
+)
+
+func appsSetup(t *testing.T) *itutils.DeisTestConfig {
+	cfg := itutils.GlobalSetup(t)
+	return cfg
+}
+
+func keysAddTest(t *testing.T, params *itutils.DeisTestConfig) {
+	cmd := itutils.GetCommand("keys", "add")
+	itutils.Execute(t, cmd, params, false, "")
+	itutils.Execute(t, cmd, params, true, "Uploading deis to Deis...400 BAD REQUEST")
+}
+
+func keysListTest(t *testing.T, params *itutils.DeisTestConfig) {
+	cmd := itutils.GetCommand("keys", "list")
+	itutils.Execute(t, cmd, params, false, "")
+}
+
+func keysRemoveTest(t *testing.T, params *itutils.DeisTestConfig) {
+	cmd := itutils.GetCommand("keys", "remove")
+	itutils.Execute(t, cmd, params, false, "")
+	itutils.Execute(t, cmd, params, true, "Not found")
+}
+
+func TestKeys(t *testing.T) {
+	params := keysSetup(t)
+	keysAddTest(t, params)
+	keysListTest(t, params)
+	keysRemoveTest(t, params)
+}
diff --git a/integration/auth_test.go b/integration/auth_test.go
@@ -7,44 +7,45 @@ import (
 )
 
 func authSetup(t *testing.T) *itutils.UserDetails {
-	//_ = itutils.GlobalSetup(t)
+	cfg := itutils.GlobalSetup(t)
 	ucfg := itutils.SetUser()
 	fmt.Println("username :" + ucfg.UserName)
 	fmt.Println("password :" + ucfg.Password)
+	ucfg.HostName = cfg.HostName
 	return ucfg
 }
 
 func authRegisterTest(t *testing.T, params *itutils.UserDetails) {
 	cmd := itutils.GetCommand("auth", "register")
-	itutils.Execute(t, cmd, params, false,"")
-	itutils.Execute(t, cmd, params, true,"Registration failed")
+	itutils.Execute(t, cmd, params, false, "")
+	itutils.Execute(t, cmd, params, true, "Registration failed")
 }
 
 func authLoginTest(t *testing.T, params *itutils.UserDetails) {
 	cmd := itutils.GetCommand("auth", "login")
-	itutils.Execute(t, cmd, params, false,"")
+	itutils.Execute(t, cmd, params, false, "")
 	params = authSetup(t)
-	itutils.Execute(t, cmd, params, true,"200 OK")
+	itutils.Execute(t, cmd, params, true, "200 OK")
 }
 
 func authLogoutTest(t *testing.T, params *itutils.UserDetails) {
 	cmd := itutils.GetCommand("auth", "logout")
-	itutils.Execute(t, cmd, params, false,"")
+	itutils.Execute(t, cmd, params, false, "")
 
 }
 
 func authCancel() {
-	fmt.Println("coming soon")
+	fmt.Println("gexpect implementation")
 }
 
-func teardown(t *testing.T, params *itutils.UserDetails){
-  authLogoutTest(t, params)
+func teardown(t *testing.T, params *itutils.UserDetails) {
+	authLogoutTest(t, params)
 }
 
 func TestAuth(t *testing.T) {
 	params := authSetup(t)
 	authRegisterTest(t, params)
 	authLogoutTest(t, params)
 	authLoginTest(t, params)
-  teardown(t, params)
+	teardown(t, params)
 }
diff --git a/integration/cluster_test.go b/integration/cluster_test.go
@@ -0,0 +1,64 @@
+package verbose
+
+import (
+	_ "fmt"
+	"github.com/deis/deis/tests/integration-utils"
+	"testing"
+)
+
+func clustersSetup(t *testing.T) *ClusterDetails {
+	cfg := itutils.GlobalSetup(t)
+	cscfg := itutils.ClusterDetails{
+		cfg.ClusterName,
+		cfg.Hosts,
+		"172.17.8.100",
+		cfg.AuthKey,
+		cfg.HostName,
+	}
+	cmd := itutils.GetCommand("keys", "add")
+	itutils.Execute(t, cmd, cfg, false, "")
+	return &cscfg
+}
+
+func clustersCreateTest(t *testing.T, params *ClusterDetails) {
+	cmd := itutils.GetCommand("clusters", "create")
+	itutils.Execute(t, cmd, params, false, "")
+	itutils.Execute(t, cmd, params, true, "Cluster with this Id already exists")
+}
+
+func clustersListTest(t *testing.T, params *ClusterDetails) {
+	cmd := itutils.GetCommand("clusters", "list")
+	itutils.Execute(t, cmd, params, false, "")
+}
+
+func clustersInfoTest(t *testing.T, params *ClusterDetails) {
+	cmd := itutils.GetCommand("clusters", "info")
+	itutils.Execute(t, cmd, params, false, "")
+	params.ClusterName = "kin"
+	itutils.Execute(t, cmd, params, true, "Not found")
+	params.ClusterName = "dev"
+}
+
+func clustersUpdateTest(t *testing.T, params *ClusterDetails) {
+	cmd := itutils.GetCommand("clusters", "update")
+	itutils.Execute(t, cmd, params, false, "")
+	params.ClusterName = "kin"
+	itutils.Execute(t, cmd, params, true, "Not found")
+	params.ClusterName = "dev"
+}
+
+func clustersDestroyTest(t *testing.T, params *ClusterDetails) {
+	cmd := itutils.GetCommand("clusters", "destroy")
+	itutils.Execute(t, cmd, params, false, "")
+	itutils.Execute(t, cmd, params, true, "Not found")
+}
+
+func TestKeys(t *testing.T) {
+	params := clustersSetup(t)
+	clustersCreateTest(t, params)
+	clustersListTest(t, params)
+	clustersInfoTest(t, params)
+	clustersUpdateTest(t, params)
+	//clustersDestroyTest(t, params)
+
+}
diff --git a/integration/keys_test.go b/integration/keys_test.go
@@ -13,23 +13,19 @@ func keysSetup(t *testing.T) *itutils.DeisTestConfig {
 
 func keysAddTest(t *testing.T, params *itutils.DeisTestConfig) {
 	cmd := itutils.GetCommand("keys", "add")
-	itutils.Execute(t, cmd, params, false,"")
-	itutils.Execute(t, cmd, params, true,"Uploading deis to Deis...400 BAD REQUEST")
+	itutils.Execute(t, cmd, params, false, "")
+	itutils.Execute(t, cmd, params, true, "Uploading deis to Deis...400 BAD REQUEST")
 }
 
 func keysListTest(t *testing.T, params *itutils.DeisTestConfig) {
 	cmd := itutils.GetCommand("keys", "list")
-	itutils.Execute(t, cmd, params, false,"")
+	itutils.Execute(t, cmd, params, false, "")
 }
 
 func keysRemoveTest(t *testing.T, params *itutils.DeisTestConfig) {
 	cmd := itutils.GetCommand("keys", "remove")
-	itutils.Execute(t, cmd, params, false,"")
-  itutils.Execute(t, cmd, params, true,"Not found")
-}
-
-func authCancel() {
-	fmt.Println("coming soon")
+	itutils.Execute(t, cmd, params, false, "")
+	itutils.Execute(t, cmd, params, true, "Not found")
 }
 
 func TestKeys(t *testing.T) {

diff --git a/integration/testconfig.json b/integration/testconfig.json
@@ -10,6 +10,18 @@
       "add": "keys:add {{.AuthKey}}.pub || true",
       "list": "keys:list",
       "remove": "keys:remove {{.AuthKey}} ||true"
+    },
+    "clusters": {
+      "create": "clusters:create {{.ClusterName}} http://{{.HostName}} --hosts={{.Hosts}} --auth={{.AuthKey}} || true",
+      "list": "clusters:list",
+      "update": "clusters:update {{.ClusterName}} --domain=http://{{.HostName}} --hosts={{.UpdatedHosts}} --auth={{.AuthKey}} ||true",
+      "info": "clusters:info {{.ClusterName}}",
+      "destroy" : "clusters:destroy {{.ClusterName}} --confirm={{.ClusterName}}"
+    },
+    "git" : {
+      "clone" : "git clone https://github.com/deis/{{.ExampleApp}}.git",
+      "remove" : "git remote remove deis",
+      "push" : "git push deis master"
     }
   },
   "apps": {