Skip to content

Commit 5814719

Browse files
smothikimboersma
smothiki
authored and
mboersma
committed
chore(tests/integration): vendor json library and adjust indentation
1 parent 2eb9688 commit 5814719

9 files changed

Lines changed: 738 additions & 31 deletions

File tree

‎integration/apps_test.go‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package verbose
2+
3+
import (
4+
"fmt"
5+
"github.com/deis/deis/tests/integration-utils"
6+
"testing"
7+
)
8+
9+
func appsSetup(t *testing.T) *itutils.DeisTestConfig {
10+
cfg := itutils.GlobalSetup(t)
11+
return cfg
12+
}
13+
14+
func keysAddTest(t *testing.T, params *itutils.DeisTestConfig) {
15+
cmd := itutils.GetCommand("keys", "add")
16+
itutils.Execute(t, cmd, params, false, "")
17+
itutils.Execute(t, cmd, params, true, "Uploading deis to Deis...400 BAD REQUEST")
18+
}
19+
20+
func keysListTest(t *testing.T, params *itutils.DeisTestConfig) {
21+
cmd := itutils.GetCommand("keys", "list")
22+
itutils.Execute(t, cmd, params, false, "")
23+
}
24+
25+
func keysRemoveTest(t *testing.T, params *itutils.DeisTestConfig) {
26+
cmd := itutils.GetCommand("keys", "remove")
27+
itutils.Execute(t, cmd, params, false, "")
28+
itutils.Execute(t, cmd, params, true, "Not found")
29+
}
30+
31+
func TestKeys(t *testing.T) {
32+
params := keysSetup(t)
33+
keysAddTest(t, params)
34+
keysListTest(t, params)
35+
keysRemoveTest(t, params)
36+
}

‎integration/auth_test.go‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,44 +7,45 @@ import (
77
)
88

99
func authSetup(t *testing.T) *itutils.UserDetails {
10-
//_ = itutils.GlobalSetup(t)
10+
cfg := itutils.GlobalSetup(t)
1111
ucfg := itutils.SetUser()
1212
fmt.Println("username :" + ucfg.UserName)
1313
fmt.Println("password :" + ucfg.Password)
14+
ucfg.HostName = cfg.HostName
1415
return ucfg
1516
}
1617

1718
func authRegisterTest(t *testing.T, params *itutils.UserDetails) {
1819
cmd := itutils.GetCommand("auth", "register")
19-
itutils.Execute(t, cmd, params, false,"")
20-
itutils.Execute(t, cmd, params, true,"Registration failed")
20+
itutils.Execute(t, cmd, params, false, "")
21+
itutils.Execute(t, cmd, params, true, "Registration failed")
2122
}
2223

2324
func authLoginTest(t *testing.T, params *itutils.UserDetails) {
2425
cmd := itutils.GetCommand("auth", "login")
25-
itutils.Execute(t, cmd, params, false,"")
26+
itutils.Execute(t, cmd, params, false, "")
2627
params = authSetup(t)
27-
itutils.Execute(t, cmd, params, true,"200 OK")
28+
itutils.Execute(t, cmd, params, true, "200 OK")
2829
}
2930

3031
func authLogoutTest(t *testing.T, params *itutils.UserDetails) {
3132
cmd := itutils.GetCommand("auth", "logout")
32-
itutils.Execute(t, cmd, params, false,"")
33+
itutils.Execute(t, cmd, params, false, "")
3334

3435
}
3536

3637
func authCancel() {
37-
fmt.Println("coming soon")
38+
fmt.Println("gexpect implementation")
3839
}
3940

40-
func teardown(t *testing.T, params *itutils.UserDetails){
41-
authLogoutTest(t, params)
41+
func teardown(t *testing.T, params *itutils.UserDetails) {
42+
authLogoutTest(t, params)
4243
}
4344

4445
func TestAuth(t *testing.T) {
4546
params := authSetup(t)
4647
authRegisterTest(t, params)
4748
authLogoutTest(t, params)
4849
authLoginTest(t, params)
49-
teardown(t, params)
50+
teardown(t, params)
5051
}

‎integration/cluster_test.go‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
package verbose
2+
3+
import (
4+
_ "fmt"
5+
"github.com/deis/deis/tests/integration-utils"
6+
"testing"
7+
)
8+
9+
func clustersSetup(t *testing.T) *ClusterDetails {
10+
cfg := itutils.GlobalSetup(t)
11+
cscfg := itutils.ClusterDetails{
12+
cfg.ClusterName,
13+
cfg.Hosts,
14+
"172.17.8.100",
15+
cfg.AuthKey,
16+
cfg.HostName,
17+
}
18+
cmd := itutils.GetCommand("keys", "add")
19+
itutils.Execute(t, cmd, cfg, false, "")
20+
return &cscfg
21+
}
22+
23+
func clustersCreateTest(t *testing.T, params *ClusterDetails) {
24+
cmd := itutils.GetCommand("clusters", "create")
25+
itutils.Execute(t, cmd, params, false, "")
26+
itutils.Execute(t, cmd, params, true, "Cluster with this Id already exists")
27+
}
28+
29+
func clustersListTest(t *testing.T, params *ClusterDetails) {
30+
cmd := itutils.GetCommand("clusters", "list")
31+
itutils.Execute(t, cmd, params, false, "")
32+
}
33+
34+
func clustersInfoTest(t *testing.T, params *ClusterDetails) {
35+
cmd := itutils.GetCommand("clusters", "info")
36+
itutils.Execute(t, cmd, params, false, "")
37+
params.ClusterName = "kin"
38+
itutils.Execute(t, cmd, params, true, "Not found")
39+
params.ClusterName = "dev"
40+
}
41+
42+
func clustersUpdateTest(t *testing.T, params *ClusterDetails) {
43+
cmd := itutils.GetCommand("clusters", "update")
44+
itutils.Execute(t, cmd, params, false, "")
45+
params.ClusterName = "kin"
46+
itutils.Execute(t, cmd, params, true, "Not found")
47+
params.ClusterName = "dev"
48+
}
49+
50+
func clustersDestroyTest(t *testing.T, params *ClusterDetails) {
51+
cmd := itutils.GetCommand("clusters", "destroy")
52+
itutils.Execute(t, cmd, params, false, "")
53+
itutils.Execute(t, cmd, params, true, "Not found")
54+
}
55+
56+
func TestKeys(t *testing.T) {
57+
params := clustersSetup(t)
58+
clustersCreateTest(t, params)
59+
clustersListTest(t, params)
60+
clustersInfoTest(t, params)
61+
clustersUpdateTest(t, params)
62+
//clustersDestroyTest(t, params)
63+
64+
}

‎integration/keys_test.go‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,19 @@ func keysSetup(t *testing.T) *itutils.DeisTestConfig {
1313

1414
func keysAddTest(t *testing.T, params *itutils.DeisTestConfig) {
1515
cmd := itutils.GetCommand("keys", "add")
16-
itutils.Execute(t, cmd, params, false,"")
17-
itutils.Execute(t, cmd, params, true,"Uploading deis to Deis...400 BAD REQUEST")
16+
itutils.Execute(t, cmd, params, false, "")
17+
itutils.Execute(t, cmd, params, true, "Uploading deis to Deis...400 BAD REQUEST")
1818
}
1919

2020
func keysListTest(t *testing.T, params *itutils.DeisTestConfig) {
2121
cmd := itutils.GetCommand("keys", "list")
22-
itutils.Execute(t, cmd, params, false,"")
22+
itutils.Execute(t, cmd, params, false, "")
2323
}
2424

2525
func keysRemoveTest(t *testing.T, params *itutils.DeisTestConfig) {
2626
cmd := itutils.GetCommand("keys", "remove")
27-
itutils.Execute(t, cmd, params, false,"")
28-
itutils.Execute(t, cmd, params, true,"Not found")
29-
}
30-
31-
func authCancel() {
32-
fmt.Println("coming soon")
27+
itutils.Execute(t, cmd, params, false, "")
28+
itutils.Execute(t, cmd, params, true, "Not found")
3329
}
3430

3531
func TestKeys(t *testing.T) {

‎integration/testconfig.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,18 @@
1010
"add": "keys:add {{.AuthKey}}.pub || true",
1111
"list": "keys:list",
1212
"remove": "keys:remove {{.AuthKey}} ||true"
13+
},
14+
"clusters": {
15+
"create": "clusters:create {{.ClusterName}} http://{{.HostName}} --hosts={{.Hosts}} --auth={{.AuthKey}} || true",
16+
"list": "clusters:list",
17+
"update": "clusters:update {{.ClusterName}} --domain=http://{{.HostName}} --hosts={{.UpdatedHosts}} --auth={{.AuthKey}} ||true",
18+
"info": "clusters:info {{.ClusterName}}",
19+
"destroy" : "clusters:destroy {{.ClusterName}} --confirm={{.ClusterName}}"
20+
},
21+
"git" : {
22+
"clone" : "git clone https://github.com/deis/{{.ExampleApp}}.git",
23+
"remove" : "git remote remove deis",
24+
"push" : "git push deis master"
1325
}
1426
},
1527
"apps": {

0 commit comments

Comments
 (0)