Go OpenStack Exchange

Merge lp:~gz/goose/tool_test_weirdness into lp:goose

  1. tool_test_weirdness
  2. Merge into trunk
Proposed by Martin Packman
Status: Merged
Approved by: Martin Packman
Approved revision: 120
Merged at revision: 120
Proposed branch: lp:~gz/goose/tool_test_weirdness
Merge into: lp:goose
Diff against target: 60 lines (+6/-7)
1 file modified
tools/secgroup-delete-all/main_test.go (+6/-7)
To merge this branch: bzr merge lp:~gz/goose/tool_test_weirdness
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+217962@code.launchpad.net

Commit message

tools/secgroup-delete-all: Change test package

Change tests to be in package main rather than main_test,
which may work around an odd issue on the landing bot.

https://codereview.appspot.com/91010044/

R=axwalk, hduran-8

Description of the change

tools/secgroup-delete-all: Change test package

Change tests to be in package main rather than main_test,
which may work around an odd issue on the landing bot.

https://codereview.appspot.com/91010044/

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

Reviewers: mp+217962_code.launchpad.net,

Message:
Please take a look.

Description:
tools/secgroup-delete-all: Change test package

Change tests to be in package main rather than main_test,
which may work around an odd issue on the landing bot.

https://code.launchpad.net/~gz/goose/tool_test_weirdness/+merge/217962

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/91010044/

Affected files (+8, -7 lines):
   A [revision details]
   M tools/secgroup-delete-all/main_test.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20140423072524-vxav71c7ko4lgtcu
+New revision: <email address hidden>

Index: tools/secgroup-delete-all/main_test.go
=== modified file 'tools/secgroup-delete-all/main_test.go'
--- tools/secgroup-delete-all/main_test.go 2013-06-22 11:39:35 +0000
+++ tools/secgroup-delete-all/main_test.go 2014-05-01 18:04:32 +0000
@@ -1,4 +1,4 @@
-package main_test
+package main

  import (
   "bytes"
@@ -10,7 +10,6 @@
   "launchpad.net/goose/testing/httpsuite"
   "launchpad.net/goose/testservices/hook"
   "launchpad.net/goose/testservices/openstackservice"
- tool "launchpad.net/goose/tools/secgroup-delete-all"
   "testing"
  )

@@ -33,7 +32,7 @@
  var _ = Suite(&ToolSuite{})

  // GZ 2013-01-21: Should require EnvSuite for this, but clashes with
HTTPSuite
-func createNovaClient(creds *identity.Credentials) *nova.Client {
+func createNovaClientFromCreds(creds *identity.Credentials) *nova.Client {
   osc := client.NewClient(creds, identity.AuthUserPass, nil)
   return nova.New(osc)
  }
@@ -48,13 +47,13 @@
   }
   openstack := openstackservice.New(creds, identity.AuthUserPass)
   openstack.SetupHTTP(s.Mux)
- return openstack, createNovaClient(creds)
+ return openstack, createNovaClientFromCreds(creds)
  }

  func (s *ToolSuite) TestNoGroups(c *C) {
   _, nova := s.makeServices(c)
   var buf bytes.Buffer
- err := tool.DeleteAll(&buf, nova)
+ err := DeleteAll(&buf, nova)
   c.Assert(err, IsNil)
   c.Assert(string(buf.Bytes()), Equals, "No security groups to delete.\n")
  }
@@ -64,7 +63,7 @@
   novaClient.CreateSecurityGroup("group-a", "A group")
   novaClient.CreateSecurityGroup("group-b", "Another group")
   var buf bytes.Buffer
- err := tool.DeleteAll(&buf, novaClient)
+ err := DeleteAll(&buf, novaClient)
   c.Assert(err, IsNil)
   c.Assert(string(buf.Bytes()), Equals, "2 security groups deleted.\n")
  }
@@ -89,7 +88,7 @@
   cleanup := os.Nova.RegisterControlPoint("removeSecurityGroup",
deleteGroupError)
   defer cleanup()
   var buf bytes.Buffer
- err := tool.DeleteAll(&buf, novaClient)
+ err := DeleteAll(&buf, novaClient)
   c.Assert(err, IsNil)
   c.Assert(string(buf.Bytes()), Equals, "2 security groups deleted.\n1
security groups could not be deleted.\n")
  }

Revision history for this message
Horacio Durán (hduran-8) wrote :

On 2014/05/01 18:08:16, gz wrote:
> Please take a look.

LGTM

https://codereview.appspot.com/91010044/

Revision history for this message
Andrew Wilkins (axwalk) wrote :

On 2014/05/01 18:08:16, gz wrote:
> Please take a look.

LGTM

https://codereview.appspot.com/91010044/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tools/secgroup-delete-all/main_test.go'
--- tools/secgroup-delete-all/main_test.go 2013-06-22 11:39:35 +0000
+++ tools/secgroup-delete-all/main_test.go 2014-05-01 18:07:33 +0000
@@ -1,4 +1,4 @@
1package main_test1package main
22
3import (3import (
4 "bytes"4 "bytes"
@@ -10,7 +10,6 @@
10 "launchpad.net/goose/testing/httpsuite"10 "launchpad.net/goose/testing/httpsuite"
11 "launchpad.net/goose/testservices/hook"11 "launchpad.net/goose/testservices/hook"
12 "launchpad.net/goose/testservices/openstackservice"12 "launchpad.net/goose/testservices/openstackservice"
13 tool "launchpad.net/goose/tools/secgroup-delete-all"
14 "testing"13 "testing"
15)14)
1615
@@ -33,7 +32,7 @@
33var _ = Suite(&ToolSuite{})32var _ = Suite(&ToolSuite{})
3433
35// GZ 2013-01-21: Should require EnvSuite for this, but clashes with HTTPSuite34// GZ 2013-01-21: Should require EnvSuite for this, but clashes with HTTPSuite
36func createNovaClient(creds *identity.Credentials) *nova.Client {35func createNovaClientFromCreds(creds *identity.Credentials) *nova.Client {
37 osc := client.NewClient(creds, identity.AuthUserPass, nil)36 osc := client.NewClient(creds, identity.AuthUserPass, nil)
38 return nova.New(osc)37 return nova.New(osc)
39}38}
@@ -48,13 +47,13 @@
48 }47 }
49 openstack := openstackservice.New(creds, identity.AuthUserPass)48 openstack := openstackservice.New(creds, identity.AuthUserPass)
50 openstack.SetupHTTP(s.Mux)49 openstack.SetupHTTP(s.Mux)
51 return openstack, createNovaClient(creds)50 return openstack, createNovaClientFromCreds(creds)
52}51}
5352
54func (s *ToolSuite) TestNoGroups(c *C) {53func (s *ToolSuite) TestNoGroups(c *C) {
55 _, nova := s.makeServices(c)54 _, nova := s.makeServices(c)
56 var buf bytes.Buffer55 var buf bytes.Buffer
57 err := tool.DeleteAll(&buf, nova)56 err := DeleteAll(&buf, nova)
58 c.Assert(err, IsNil)57 c.Assert(err, IsNil)
59 c.Assert(string(buf.Bytes()), Equals, "No security groups to delete.\n")58 c.Assert(string(buf.Bytes()), Equals, "No security groups to delete.\n")
60}59}
@@ -64,7 +63,7 @@
64 novaClient.CreateSecurityGroup("group-a", "A group")63 novaClient.CreateSecurityGroup("group-a", "A group")
65 novaClient.CreateSecurityGroup("group-b", "Another group")64 novaClient.CreateSecurityGroup("group-b", "Another group")
66 var buf bytes.Buffer65 var buf bytes.Buffer
67 err := tool.DeleteAll(&buf, novaClient)66 err := DeleteAll(&buf, novaClient)
68 c.Assert(err, IsNil)67 c.Assert(err, IsNil)
69 c.Assert(string(buf.Bytes()), Equals, "2 security groups deleted.\n")68 c.Assert(string(buf.Bytes()), Equals, "2 security groups deleted.\n")
70}69}
@@ -89,7 +88,7 @@
89 cleanup := os.Nova.RegisterControlPoint("removeSecurityGroup", deleteGroupError)88 cleanup := os.Nova.RegisterControlPoint("removeSecurityGroup", deleteGroupError)
90 defer cleanup()89 defer cleanup()
91 var buf bytes.Buffer90 var buf bytes.Buffer
92 err := tool.DeleteAll(&buf, novaClient)91 err := DeleteAll(&buf, novaClient)
93 c.Assert(err, IsNil)92 c.Assert(err, IsNil)
94 c.Assert(string(buf.Bytes()), Equals, "2 security groups deleted.\n1 security groups could not be deleted.\n")93 c.Assert(string(buf.Bytes()), Equals, "2 security groups deleted.\n1 security groups could not be deleted.\n")
95}94}

Subscribers

People subscribed via source and target branches