juju-core

Merge lp:~thumper/juju-core/better-container-instance-tests into lp:~go-bot/juju-core/trunk

  1. better-container-instance-tests
  2. Merge into trunk
Proposed by Tim Penhey
Status: Merged
Approved by: Tim Penhey
Approved revision: no longer in the source branch.
Merged at revision: 2055
Proposed branch: lp:~thumper/juju-core/better-container-instance-tests
Merge into: lp:~go-bot/juju-core/trunk
Diff against target: 45 lines (+22/-6)
1 file modified
instance/container_test.go (+22/-6)
To merge this branch: bzr merge lp:~thumper/juju-core/better-container-instance-tests
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+194975@code.launchpad.net

Commit message

instance container method tests

Be explicit in the container type equality.
Test the parsing of KVM.
Change the tests names to be consistent with the functions.

https://codereview.appspot.com/25460045/

Description of the change

instance container method tests

Be explicit in the container type equality.
Test the parsing of KVM.
Change the tests names to be consistent with the functions.

https://codereview.appspot.com/25460045/

To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :

Reviewers: mp+194975_code.launchpad.net,

Message:
Please take a look.

Description:
instance container method tests

Be explicit in the container type equality.
Test the parsing of KVM.
Change the tests names to be consistent with the functions.

https://code.launchpad.net/~thumper/juju-core/better-container-instance-tests/+merge/194975

(do not edit description out of merge proposal)

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

Affected files (+24, -6 lines):
   A [revision details]
   M instance/container_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-20131113015012-y3lnl9jzz40v7h6v
+New revision: <email address hidden>

Index: instance/container_test.go
=== modified file 'instance/container_test.go'
--- instance/container_test.go 2013-11-12 01:59:52 +0000
+++ instance/container_test.go 2013-11-13 01:40:16 +0000
@@ -19,19 +19,35 @@

  var _ = gc.Suite(&InstanceSuite{})

-func (s *InstanceSuite) TestParseAllowedContainerType(c *gc.C) {
+func (s *InstanceSuite) TestParseContainerType(c *gc.C) {
   ctype, err := instance.ParseContainerType("lxc")
   c.Assert(err, gc.IsNil)
- c.Assert(ctype, gc.Equals, instance.ContainerType("lxc"))
+ c.Assert(ctype, gc.Equals, instance.LXC)
+
+ ctype, err = instance.ParseContainerType("kvm")
+ c.Assert(err, gc.IsNil)
+ c.Assert(ctype, gc.Equals, instance.KVM)
+
   ctype, err = instance.ParseContainerType("none")
- c.Assert(err, gc.Not(gc.IsNil))
+ c.Assert(err, gc.ErrorMatches, `invalid container type "none"`)
+
+ ctype, err = instance.ParseContainerType("omg")
+ c.Assert(err, gc.ErrorMatches, `invalid container type "omg"`)
  }

-func (s *InstanceSuite) TestParseAllowedContainerTypeOrNone(c *gc.C) {
+func (s *InstanceSuite) TestParseContainerTypeOrNone(c *gc.C) {
   ctype, err := instance.ParseContainerTypeOrNone("lxc")
   c.Assert(err, gc.IsNil)
- c.Assert(ctype, gc.Equals, instance.ContainerType("lxc"))
+ c.Assert(ctype, gc.Equals, instance.LXC)
+
+ ctype, err = instance.ParseContainerTypeOrNone("kvm")
+ c.Assert(err, gc.IsNil)
+ c.Assert(ctype, gc.Equals, instance.KVM)
+
   ctype, err = instance.ParseContainerTypeOrNone("none")
   c.Assert(err, gc.IsNil)
- c.Assert(ctype, gc.Equals, instance.ContainerType("none"))
+ c.Assert(ctype, gc.Equals, instance.NONE)
+
+ ctype, err = instance.ParseSupportedContainerTypeOrNone("omg")
+ c.Assert(err, gc.ErrorMatches, `invalid container type "omg"`)
  }

Revision history for this message
Ian Booth (wallyworld) wrote :

LGTM

https://codereview.appspot.com/25460045/

Revision history for this message
Go Bot (go-bot) wrote :
Download full text (7.1 KiB)

The attempt to merge lp:~thumper/juju-core/better-container-instance-tests into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core/agent 0.752s
ok launchpad.net/juju-core/agent/tools 0.303s
ok launchpad.net/juju-core/bzr 7.174s
ok launchpad.net/juju-core/cert 3.527s
ok launchpad.net/juju-core/charm 0.564s
? launchpad.net/juju-core/charm/hooks [no test files]
ok launchpad.net/juju-core/cloudinit 0.027s
ok launchpad.net/juju-core/cmd 0.204s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/juju 173.808s
ok launchpad.net/juju-core/cmd/jujud 57.416s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 2.763s
ok launchpad.net/juju-core/constraints 0.026s
ok launchpad.net/juju-core/container 0.037s
ok launchpad.net/juju-core/container/kvm 0.045s
ok launchpad.net/juju-core/container/kvm/mock 0.036s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 0.345s
? launchpad.net/juju-core/container/lxc/mock [no test files]
? launchpad.net/juju-core/container/lxc/testing [no test files]
ok launchpad.net/juju-core/downloader 5.262s
ok launchpad.net/juju-core/environs 3.098s
ok launchpad.net/juju-core/environs/bootstrap 4.968s
ok launchpad.net/juju-core/environs/cloudinit 0.531s
ok launchpad.net/juju-core/environs/config 1.451s
ok launchpad.net/juju-core/environs/configstore 0.041s
ok launchpad.net/juju-core/environs/filestorage 0.057s
ok launchpad.net/juju-core/environs/httpstorage 0.966s
ok launchpad.net/juju-core/environs/imagemetadata 0.515s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.051s
ok launchpad.net/juju-core/environs/jujutest 0.236s
ok launchpad.net/juju-core/environs/manual 5.818s
ok launchpad.net/juju-core/environs/simplestreams 0.338s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 1.108s
ok launchpad.net/juju-core/environs/storage 1.061s
ok launchpad.net/juju-core/environs/sync 26.998s
ok launchpad.net/juju-core/environs/testing 0.191s
ok launchpad.net/juju-core/environs/tools 6.712s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/errors 0.016s
FAIL launchpad.net/juju-core/instance [build failed]
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/juju-core/juju 18.086s
ok launchpad.net/juju-core/juju/osenv 0.029s
? launchpad.net/juju-core/juju/testing [no test files]
ok launchpad.net/juju-core/log 0.029s
ok launchpad.net/juju-core/log/syslog 0.023s
ok launchpad.net/juju-core/names 0.025s
? launchpad.net/juju-core/provider [no test files]
? launchpad.net/juju-core/provider/all [no test files]
ok launchpad.net/juju-core/provider/azure 6.371s
ok launchpad.net/juju-core/provider/common 0.269s
ok launchpad.net/juju-core/provider/dummy 20.626s
ok launchpad.net/juju-core/provider/ec2 5.123s
ok launchpad.net/juju-core/provider/ec2/h...

Read more...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'instance/container_test.go'
2--- instance/container_test.go 2013-11-12 01:59:52 +0000
3+++ instance/container_test.go 2013-11-13 04:04:29 +0000
4@@ -19,19 +19,35 @@
5
6 var _ = gc.Suite(&InstanceSuite{})
7
8-func (s *InstanceSuite) TestParseAllowedContainerType(c *gc.C) {
9+func (s *InstanceSuite) TestParseContainerType(c *gc.C) {
10 ctype, err := instance.ParseContainerType("lxc")
11 c.Assert(err, gc.IsNil)
12- c.Assert(ctype, gc.Equals, instance.ContainerType("lxc"))
13+ c.Assert(ctype, gc.Equals, instance.LXC)
14+
15+ ctype, err = instance.ParseContainerType("kvm")
16+ c.Assert(err, gc.IsNil)
17+ c.Assert(ctype, gc.Equals, instance.KVM)
18+
19 ctype, err = instance.ParseContainerType("none")
20- c.Assert(err, gc.Not(gc.IsNil))
21+ c.Assert(err, gc.ErrorMatches, `invalid container type "none"`)
22+
23+ ctype, err = instance.ParseContainerType("omg")
24+ c.Assert(err, gc.ErrorMatches, `invalid container type "omg"`)
25 }
26
27-func (s *InstanceSuite) TestParseAllowedContainerTypeOrNone(c *gc.C) {
28+func (s *InstanceSuite) TestParseContainerTypeOrNone(c *gc.C) {
29 ctype, err := instance.ParseContainerTypeOrNone("lxc")
30 c.Assert(err, gc.IsNil)
31- c.Assert(ctype, gc.Equals, instance.ContainerType("lxc"))
32+ c.Assert(ctype, gc.Equals, instance.LXC)
33+
34+ ctype, err = instance.ParseContainerTypeOrNone("kvm")
35+ c.Assert(err, gc.IsNil)
36+ c.Assert(ctype, gc.Equals, instance.KVM)
37+
38 ctype, err = instance.ParseContainerTypeOrNone("none")
39 c.Assert(err, gc.IsNil)
40- c.Assert(ctype, gc.Equals, instance.ContainerType("none"))
41+ c.Assert(ctype, gc.Equals, instance.NONE)
42+
43+ ctype, err = instance.ParseContainerTypeOrNone("omg")
44+ c.Assert(err, gc.ErrorMatches, `invalid container type "omg"`)
45 }

Subscribers

People subscribed via source and target branches

to status/vote changes: