Skip to content
This repository was archived by the owner on Aug 1, 2023. It is now read-only.

Commit 1110840

Browse files
author
Jamie Hannaford
committed
Finalizing most acceptance tests
1 parent 05d200d commit 1110840

File tree

23 files changed

+179
-158
lines changed

23 files changed

+179
-158
lines changed

‎acceptance/openstack/db/v1/common.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88

99
"github.com/rackspace/gophercloud"
1010
"github.com/rackspace/gophercloud/openstack"
11+
"github.com/rackspace/gophercloud/openstack/db/v1/instances"
1112
th "github.com/rackspace/gophercloud/testhelper"
1213
)
1314

@@ -31,6 +32,7 @@ type context struct {
3132
client *gophercloud.ServiceClient
3233
instanceID string
3334
DBIDs []string
35+
users []string
3436
}
3537

3638
func newContext(t *testing.T) context {
@@ -59,4 +61,6 @@ func (c context) WaitUntilActive(id string) {
5961
}
6062
return false, nil
6163
})
64+
65+
c.AssertNoErr(err)
6266
}

‎acceptance/openstack/db/v1/database_test.go

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010

1111
func (c context) createDBs() {
1212
dbs := []string{
13-
tools.RandomString("db_"),
14-
tools.RandomString("db_"),
15-
tools.RandomString("db_"),
13+
tools.RandomString("db_", 5),
14+
tools.RandomString("db_", 5),
15+
tools.RandomString("db_", 5),
1616
}
1717

1818
opts := db.BatchCreateOpts{
@@ -21,15 +21,16 @@ func (c context) createDBs() {
2121
db.CreateOpts{Name: dbs[2]},
2222
}
2323

24-
res := db.Create(c.client, c.instanceID, opts)
24+
err := db.Create(c.client, c.instanceID, opts).ExtractErr()
25+
c.AssertNoErr(err)
2526
c.Logf("Created three databases on instance %s: %s, %s, %s", c.instanceID, dbs[0], dbs[1], dbs[2])
2627
c.DBIDs = dbs
2728
}
2829

2930
func (c context) listDBs() {
3031
c.Logf("Listing databases on instance %s", c.instanceID)
3132

32-
err := dbs.List(c.client, c.instanceID).EachPage(func(page pagination.Page) (bool, error) {
33+
err := db.List(c.client, c.instanceID).EachPage(func(page pagination.Page) (bool, error) {
3334
dbList, err := db.ExtractDBs(page)
3435
c.AssertNoErr(err)
3536

@@ -40,13 +41,13 @@ func (c context) listDBs() {
4041
return true, nil
4142
})
4243

43-
c.CheckNoErr(err)
44+
c.AssertNoErr(err)
4445
}
4546

4647
func (c context) deleteDBs() {
4748
for _, id := range c.DBIDs {
4849
err := db.Delete(c.client, c.instanceID, id).ExtractErr()
49-
c.CheckNoErr(err)
50-
t.Logf("Deleted DB %s", id)
50+
c.AssertNoErr(err)
51+
c.Logf("Deleted DB %s", id)
5152
}
5253
}

‎acceptance/openstack/db/v1/flavor_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
func (c context) listFlavors() {
1111
c.Logf("Listing flavors")
1212

13-
err := flavors.List(c.client, c.instanceID).EachPage(func(page pagination.Page) (bool, error) {
14-
flavorList, err := db.ExtractFlavors(page)
13+
err := flavors.List(c.client).EachPage(func(page pagination.Page) (bool, error) {
14+
flavorList, err := flavors.ExtractFlavors(page)
1515
c.AssertNoErr(err)
1616

1717
for _, f := range flavorList {
@@ -21,11 +21,11 @@ func (c context) listFlavors() {
2121
return true, nil
2222
})
2323

24-
c.CheckNoErr(err)
24+
c.AssertNoErr(err)
2525
}
2626

2727
func (c context) getFlavor() {
28-
flavor, err := flavors.Get(c.client, "1").Extract()
28+
flavor, err := flavors.Get(c.client, 1).Extract()
2929
c.Logf("Getting flavor %s", flavor.ID)
30-
c.CheckNoErr(err)
30+
c.AssertNoErr(err)
3131
}

‎acceptance/openstack/db/v1/instance_test.go

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@
33
package v1
44

55
import (
6+
"testing"
7+
68
"github.com/rackspace/gophercloud/acceptance/tools"
79
"github.com/rackspace/gophercloud/openstack/db/v1/instances"
810
"github.com/rackspace/gophercloud/pagination"
11+
rackspaceInst "github.com/rackspace/gophercloud/rackspace/db/v1/instances"
912
th "github.com/rackspace/gophercloud/testhelper"
1013
)
1114

12-
func TestRunner(t *testingT) {
15+
func TestRunner(t *testing.T) {
1316
c := newContext(t)
1417

1518
// FLAVOR tests
@@ -28,7 +31,7 @@ func TestRunner(t *testingT) {
2831
c.resizeVol()
2932

3033
// DATABASE tests
31-
c.createDB()
34+
c.createDBs()
3235
c.listDBs()
3336

3437
// USER tests
@@ -38,21 +41,22 @@ func TestRunner(t *testingT) {
3841
// TEARDOWN
3942
c.deleteUsers()
4043
c.deleteDBs()
41-
c.deleteInstance(id)
44+
c.deleteInstance()
4245
}
4346

4447
func (c context) createInstance() {
45-
opts := instances.CreateOpts{
48+
opts := rackspaceInst.CreateOpts{
4649
FlavorRef: "1",
4750
Size: 1,
4851
Name: tools.RandomString("gopher_db", 5),
52+
Datastore: &rackspaceInst.DatastoreOpts{Version: "5.6", Type: "MySQL"},
4953
}
5054

5155
instance, err := instances.Create(c.client, opts).Extract()
5256
th.AssertNoErr(c.test, err)
5357

54-
c.Logf("Restarting %s. Waiting...", id)
55-
c.WaitUntilActive(id)
58+
c.Logf("Restarting %s. Waiting...", instance.ID)
59+
c.WaitUntilActive(instance.ID)
5660
c.Logf("Created DB %#v", instance)
5761

5862
c.instanceID = instance.ID
@@ -65,14 +69,14 @@ func (c context) listInstances() {
6569
instanceList, err := instances.ExtractInstances(page)
6670
c.AssertNoErr(err)
6771

68-
for _, n := range networkList {
69-
c.Logf("Instance: %#v", instance)
72+
for _, i := range instanceList {
73+
c.Logf("Instance: %#v", i)
7074
}
7175

7276
return true, nil
7377
})
7478

75-
c.CheckNoErr(err)
79+
c.AssertNoErr(err)
7680
}
7781

7882
func (c context) getInstance() {
@@ -88,7 +92,7 @@ func (c context) deleteInstance() {
8892
}
8993

9094
func (c context) enableRootUser() {
91-
err := instances.EnableRootUser(c.client, c.instanceID).ExtractErr()
95+
_, err := instances.EnableRootUser(c.client, c.instanceID).Extract()
9296
c.AssertNoErr(err)
9397
c.Logf("Enabled root user on %s", c.instanceID)
9498
}
@@ -101,7 +105,7 @@ func (c context) isRootEnabled() {
101105

102106
func (c context) restartInstance() {
103107
id := c.instanceID
104-
err := instances.Restart(c.client, id).ExtractErr()
108+
err := instances.RestartService(c.client, id).ExtractErr()
105109
c.AssertNoErr(err)
106110
c.Logf("Restarting %s. Waiting...", id)
107111
c.WaitUntilActive(id)
@@ -110,7 +114,7 @@ func (c context) restartInstance() {
110114

111115
func (c context) resizeInstance() {
112116
id := c.instanceID
113-
err := instances.Resize(c.client, id, "2").ExtractErr()
117+
err := instances.ResizeInstance(c.client, id, "2").ExtractErr()
114118
c.AssertNoErr(err)
115119
c.Logf("Resizing %s. Waiting...", id)
116120
c.WaitUntilActive(id)
@@ -119,7 +123,7 @@ func (c context) resizeInstance() {
119123

120124
func (c context) resizeVol() {
121125
id := c.instanceID
122-
err := instances.ResizeVol(c.client, id, 2).ExtractErr()
126+
err := instances.ResizeVolume(c.client, id, 2).ExtractErr()
123127
c.AssertNoErr(err)
124128
c.Logf("Resizing volume of %s. Waiting...", id)
125129
c.WaitUntilActive(id)

‎acceptance/openstack/db/v1/user_test.go

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,42 +11,43 @@ import (
1111

1212
func (c context) createUsers() {
1313
users := []string{
14-
tools.RandomString("user_"),
15-
tools.RandomString("user_"),
16-
tools.RandomString("user_"),
14+
tools.RandomString("user_", 5),
15+
tools.RandomString("user_", 5),
16+
tools.RandomString("user_", 5),
1717
}
1818

19-
db1 := db.CreateOpt{Name: c.DBIDs[0]}
20-
db2 := db.CreateOpt{Name: c.DBIDs[1]}
21-
db3 := db.CreateOpt{Name: c.DBIDs[2]}
19+
db1 := db.CreateOpts{Name: c.DBIDs[0]}
20+
db2 := db.CreateOpts{Name: c.DBIDs[1]}
21+
db3 := db.CreateOpts{Name: c.DBIDs[2]}
2222

2323
opts := u.BatchCreateOpts{
2424
u.CreateOpts{
2525
Name: users[0],
26-
Password: tools.RandomString(),
27-
databases: db.BatchCreateOpts{db1, db2, db3},
26+
Password: tools.RandomString("", 5),
27+
Databases: db.BatchCreateOpts{db1, db2, db3},
2828
},
2929
u.CreateOpts{
3030
Name: users[1],
31-
Password: tools.RandomString(),
32-
databases: db.BatchCreateOpts{db1, db2},
31+
Password: tools.RandomString("", 5),
32+
Databases: db.BatchCreateOpts{db1, db2},
3333
},
3434
u.CreateOpts{
3535
Name: users[2],
36-
Password: tools.RandomString(),
37-
databases: db.BatchCreateOpts{db3},
36+
Password: tools.RandomString("", 5),
37+
Databases: db.BatchCreateOpts{db3},
3838
},
3939
}
4040

4141
err := u.Create(c.client, c.instanceID, opts).ExtractErr()
42+
c.AssertNoErr(err)
4243
c.Logf("Created three users on instance %s: %s, %s, %s", c.instanceID, users[0], users[1], users[2])
4344
c.users = users
4445
}
4546

4647
func (c context) listUsers() {
4748
c.Logf("Listing databases on instance %s", c.instanceID)
4849

49-
err := dbs.List(c.client, c.instanceID).EachPage(func(page pagination.Page) (bool, error) {
50+
err := db.List(c.client, c.instanceID).EachPage(func(page pagination.Page) (bool, error) {
5051
dbList, err := db.ExtractDBs(page)
5152
c.AssertNoErr(err)
5253

@@ -57,13 +58,13 @@ func (c context) listUsers() {
5758
return true, nil
5859
})
5960

60-
c.CheckNoErr(err)
61+
c.AssertNoErr(err)
6162
}
6263

6364
func (c context) deleteUsers() {
6465
for _, id := range c.DBIDs {
6566
err := db.Delete(c.client, c.instanceID, id).ExtractErr()
66-
c.CheckNoErr(err)
67-
t.Logf("Deleted DB %s", id)
67+
c.AssertNoErr(err)
68+
c.Logf("Deleted DB %s", id)
6869
}
6970
}

‎acceptance/rackspace/db/v1/backup_test.go

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,24 @@
22

33
package v1
44

5-
import "github.com/rackspace/gophercloud/pagination"
5+
import (
6+
"github.com/rackspace/gophercloud/acceptance/tools"
7+
"github.com/rackspace/gophercloud/pagination"
8+
9+
"github.com/rackspace/gophercloud/rackspace/db/v1/backups"
10+
"github.com/rackspace/gophercloud/rackspace/db/v1/instances"
11+
)
612

713
func (c context) createBackup() {
814
opts := backups.CreateOpts{
9-
Name: tools.PrefixString("backup_", 5),
15+
Name: tools.RandomString("backup_", 5),
1016
InstanceID: c.instanceID,
1117
}
1218

13-
backup, err := backups.Create(c.client, opts)
19+
backup, err := backups.Create(c.client, opts).Extract()
1420

1521
c.Logf("Created backup %#v", backup)
16-
c.AssertNoErr(t, err)
22+
c.AssertNoErr(err)
1723

1824
c.backupID = backup.ID
1925
}
@@ -27,7 +33,7 @@ func (c context) getBackup() {
2733
func (c context) listAllBackups() {
2834
c.Logf("Listing backups")
2935

30-
err := backups.List(c.client).EachPage(func(page pagination.Page) (bool, error) {
36+
err := backups.List(c.client, nil).EachPage(func(page pagination.Page) (bool, error) {
3137
backupList, err := backups.ExtractBackups(page)
3238
c.AssertNoErr(err)
3339

@@ -38,13 +44,13 @@ func (c context) listAllBackups() {
3844
return true, nil
3945
})
4046

41-
c.CheckNoErr(err)
47+
c.AssertNoErr(err)
4248
}
4349

4450
func (c context) listInstanceBackups() {
4551
c.Logf("Listing backups for instance %s", c.instanceID)
4652

47-
err := instances.ListBackups(c.client).EachPage(func(page pagination.Page) (bool, error) {
53+
err := instances.ListBackups(c.client, c.instanceID).EachPage(func(page pagination.Page) (bool, error) {
4854
backupList, err := backups.ExtractBackups(page)
4955
c.AssertNoErr(err)
5056

@@ -55,7 +61,7 @@ func (c context) listInstanceBackups() {
5561
return true, nil
5662
})
5763

58-
c.CheckNoErr(err)
64+
c.AssertNoErr(err)
5965
}
6066

6167
func (c context) deleteBackup() {

‎acceptance/rackspace/db/v1/common.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"github.com/rackspace/gophercloud"
1010
"github.com/rackspace/gophercloud/openstack"
1111
"github.com/rackspace/gophercloud/rackspace"
12+
"github.com/rackspace/gophercloud/rackspace/db/v1/instances"
1213
th "github.com/rackspace/gophercloud/testhelper"
1314
)
1415

@@ -35,6 +36,7 @@ type context struct {
3536
replicaID string
3637
backupID string
3738
configGroupID string
39+
users []string
3840
}
3941

4042
func newContext(t *testing.T) context {
@@ -63,4 +65,5 @@ func (c context) WaitUntilActive(id string) {
6365
}
6466
return false, nil
6567
})
68+
c.AssertNoErr(err)
6669
}

0 commit comments

Comments
 (0)