juju-core

Merge lp:~jimmiebtlr/juju-core/fix-no-peers-charms into lp:~go-bot/juju-core/trunk

fix-no-peers-charms
Merge into trunk

Proposed by Jimmie Butler on 2014-05-28

Status:

Needs review

Proposed branch:

lp:~jimmiebtlr/juju-core/fix-no-peers-charms

Merge into:

lp:~go-bot/juju-core/trunk

Diff against target:

198 lines (+52/-17)

5 files modified

charm/meta.go (+2/-2)
charm/meta_test.go (+15/-6)
schema/schema.go (+20/-0)
schema/schema_test.go (+9/-9)
testing/repo/quantal/empty-fields/metadata.yaml (+6/-0)

To merge this branch:

bzr merge lp:~jimmiebtlr/juju-core/fix-no-peers-charms

Low

Won't Fix

Link a bug report

Reviewer	Review Type	Date Requested	Status
Juju Engineering		2014-05-28	Pending
Review via email: mp+221156@code.launchpad.net

Commit message

charm: accept missing relation maps

https://codereview.appspot.com/101810046/

Description of the change

Allow charms without a peer listed.

https://codereview.appspot.com/101810046/

Revision history for this message

Jimmie Butler (jimmiebtlr) wrote on 2014-05-28:

Download full text (8.0 KiB)

Reviewers: mp+221156_code.launchpad.net,

Message:
Please take a look.

Description:
Allow charms without a peer listed.

https://code.launchpad.net/~jimmiebtlr/juju-core/fix-no-peers-charms/+merge/221156

(do not edit description out of merge proposal)

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

Affected files (+61, -24 lines):
   A [revision details]
   M charm/meta.go
   M charm/meta_test.go
   M schema/schema.go
   M schema/schema_test.go
   A testing/repo/quantal/empty-fields/metadata.yaml

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-20140528050243-agcci9rl0vqrr911
+New revision: <email address hidden>

Index: charm/meta.go
=== modified file 'charm/meta.go'
--- charm/meta.go 2014-04-09 16:36:12 +0000
+++ charm/meta.go 2014-05-21 01:59:05 +0000
@@ -96,13 +96,13 @@
   Summary string
   Description string
   Subordinate bool
- Provides map[string]Relation `bson:",omitempty"`
- Requires map[string]Relation `bson:",omitempty"`
- Peers map[string]Relation `bson:",omitempty"`
- Format int `bson:",omitempty"`
- OldRevision int `bson:",omitempty"` // Obsolete
- Categories []string `bson:",omitempty"`
- Series string `bson:",omitempty"`
+ Provides map[string]Relation
+ Requires map[string]Relation
+ Peers map[string]Relation
+ Format int `bson:",omitempty"`
+ OldRevision int `bson:",omitempty"` // Obsolete
+ Categories []string `bson:",omitempty"`
+ Series string `bson:",omitempty"`
  }

func generateRelationHooks(relName string, allHooks map[string]bool) {
@@ -262,10 +262,10 @@
}

  func parseRelations(relations interface{}, role RelationRole)
map[string]Relation {
+ result := make(map[string]Relation)
   if relations == nil {
- return nil
+ return result
   }
- result := make(map[string]Relation)
   for name, rel := range relations.(map[string]interface{}) {
    relMap := rel.(map[string]interface{})
    relation := Relation{

Index: charm/meta_test.go
=== modified file 'charm/meta_test.go'
--- charm/meta_test.go 2014-04-09 16:36:12 +0000
+++ charm/meta_test.go 2014-05-28 05:01:55 +0000
@@ -93,8 +93,8 @@
    Interface: "mysql",
    Scope: charm.ScopeGlobal,
   })
- c.Assert(meta.Requires, gc.IsNil)
- c.Assert(meta.Peers, gc.IsNil)
+ c.Assert(meta.Requires, gc.DeepEquals, map[string]charm.Relation{})
+ c.Assert(meta.Peers, gc.DeepEquals, map[string]charm.Relation{})

   meta, err = charm.ReadMeta(repoMeta("riak"))
   c.Assert(err, gc.IsNil)
@@ -117,7 +117,7 @@
    Limit: 1,
    Scope: charm.ScopeGlobal,
   })
- c.Assert(meta.Requires, gc.IsNil)
+ c.Assert(meta.Requires, gc.DeepEquals, map[string]charm.Relation{})

   meta, err = charm.ReadMeta(repoMeta("terracotta"))
   c.Assert(err, gc.IsNil)
@@ -135,7 +135,7 @@
    Limit: 1,
    Scope: charm.ScopeGlobal,
   })
- c.Assert(meta.Requires, gc.IsNil)
+ c.Assert(meta.Requires, gc.DeepEquals, map[string]charm.Relation{})

meta, err = charm.ReadMeta...

Reviewers: mp+221156_code.launchpad.net,

Message:
Please take a look.

Description:
Allow charms without a peer listed.

https://code.launchpad.net/~jimmiebtlr/juju-core/fix-no-peers-charms/+merge/221156

(do not edit description out of merge proposal)

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

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-20140528050243-agcci9rl0vqrr911
+New revision: jimmiebtlr@gmail.com-20140528052757-wy0pwa82bevm58d7

Index: charm/meta.go
=== modified file 'charm/meta.go'
--- charm/meta.go	2014-04-09 16:36:12 +0000
+++ charm/meta.go	2014-05-21 01:59:05 +0000
@@ -96,13 +96,13 @@
  	Summary     string
  	Description string
  	Subordinate bool
-	Provides    map[string]Relation `bson:",omitempty"`
-	Requires    map[string]Relation `bson:",omitempty"`
-	Peers       map[string]Relation `bson:",omitempty"`
-	Format      int                 `bson:",omitempty"`
-	OldRevision int                 `bson:",omitempty"` // Obsolete
-	Categories  []string            `bson:",omitempty"`
-	Series      string              `bson:",omitempty"`
+	Provides    map[string]Relation
+	Requires    map[string]Relation
+	Peers       map[string]Relation
+	Format      int      `bson:",omitempty"`
+	OldRevision int      `bson:",omitempty"` // Obsolete
+	Categories  []string `bson:",omitempty"`
+	Series      string   `bson:",omitempty"`
  }

func generateRelationHooks(relName string, allHooks map[string]bool) {
@@ -262,10 +262,10 @@
  }

func parseRelations(relations interface{}, role RelationRole)  
map[string]Relation {
+	result := make(map[string]Relation)
  	if relations == nil {
-		return nil
+		return result
  	}
-	result := make(map[string]Relation)
  	for name, rel := range relations.(map[string]interface{}) {
  		relMap := rel.(map[string]interface{})
  		relation := Relation{

Index: charm/meta_test.go
=== modified file 'charm/meta_test.go'
--- charm/meta_test.go	2014-04-09 16:36:12 +0000
+++ charm/meta_test.go	2014-05-28 05:01:55 +0000
@@ -93,8 +93,8 @@
  		Interface: "mysql",
  		Scope:     charm.ScopeGlobal,
  	})
-	c.Assert(meta.Requires, gc.IsNil)
-	c.Assert(meta.Peers, gc.IsNil)
+	c.Assert(meta.Requires, gc.DeepEquals, map[string]charm.Relation{})
+	c.Assert(meta.Peers, gc.DeepEquals, map[string]charm.Relation{})

meta, err = charm.ReadMeta(repoMeta("riak"))
  	c.Assert(err, gc.IsNil)
@@ -117,7 +117,7 @@
  		Limit:     1,
  		Scope:     charm.ScopeGlobal,
  	})
-	c.Assert(meta.Requires, gc.IsNil)
+	c.Assert(meta.Requires, gc.DeepEquals, map[string]charm.Relation{})

meta, err = charm.ReadMeta(repoMeta("terracotta"))
  	c.Assert(err, gc.IsNil)
@@ -135,7 +135,7 @@
  		Limit:     1,
  		Scope:     charm.ScopeGlobal,
  	})
-	c.Assert(meta.Requires, gc.IsNil)
+	c.Assert(meta.Requires, gc.DeepEquals, map[string]charm.Relation{})

meta, err = charm.ReadMeta(repoMeta("wordpress"))
  	c.Assert(err, gc.IsNil)
@@ -160,7 +160,13 @@
  		Optional:  true,
  		Scope:     charm.ScopeGlobal,
  	})
-	c.Assert(meta.Peers, gc.IsNil)
+	c.Assert(meta.Peers, gc.DeepEquals, map[string]charm.Relation{})
+
+	meta, err = charm.ReadMeta(repoMeta("empty-fields"))
+	c.Assert(err, gc.IsNil)
+	c.Assert(meta.Provides, gc.DeepEquals, map[string]charm.Relation{})
+	c.Assert(meta.Requires, gc.DeepEquals, map[string]charm.Relation{})
+	c.Assert(meta.Peers, gc.DeepEquals, map[string]charm.Relation{})
  }

var relationsConstraintsTests = []struct {
@@ -396,12 +402,15 @@
  	for i, codec := range codecs {
  		c.Logf("codec %d", i)
  		empty_input := charm.Meta{}
+		empty_input.Provides = make(map[string]charm.Relation)
+		empty_input.Peers = make(map[string]charm.Relation)
+		empty_input.Requires = make(map[string]charm.Relation)
  		data, err := codec.Marshal(empty_input)
  		c.Assert(err, gc.IsNil)
  		var empty_output charm.Meta
  		err = codec.Unmarshal(data, &empty_output)
  		c.Assert(err, gc.IsNil)
-		c.Assert(empty_input, gc.DeepEquals, empty_output)
+		c.Assert(empty_output, gc.DeepEquals, empty_input)
  	}
  }

Index: schema/schema.go
=== modified file 'schema/schema.go'
--- schema/schema.go	2014-01-15 10:50:11 +0000
+++ schema/schema.go	2014-05-21 01:38:00 +0000
@@ -293,6 +293,11 @@

func (c mapC) Coerce(v interface{}, path []string) (interface{}, error) {
  	rv := reflect.ValueOf(v)
+
+	// treat nil value as empty map
+	if rv.Kind() == reflect.Invalid {
+		return make(map[interface{}]interface{}), nil
+	}
  	if rv.Kind() != reflect.Map {
  		return nil, error_{"map", v, path}
  	}
@@ -334,6 +339,11 @@

func (c stringMapC) Coerce(v interface{}, path []string) (interface{},  
error) {
  	rv := reflect.ValueOf(v)
+
+	// treat nil value as empty map
+	if rv.Kind() == reflect.Invalid {
+		return make(map[string]interface{}), nil
+	}
  	if rv.Kind() != reflect.Map {
  		return nil, error_{"map", v, path}
  	}
@@ -399,6 +409,11 @@

func (c fieldMapC) Coerce(v interface{}, path []string) (interface{},  
error) {
  	rv := reflect.ValueOf(v)
+
+	// treat nil value as empty map
+	if rv.Kind() == reflect.Invalid {
+		return make(map[string]interface{}), nil
+	}
  	if rv.Kind() != reflect.Map {
  		return nil, error_{"map", v, path}
  	}
@@ -488,6 +503,11 @@

func (c mapSetC) Coerce(v interface{}, path []string) (interface{}, error)  
{
  	rv := reflect.ValueOf(v)
+
+	// treat nil value as empty map
+	if rv.Kind() == reflect.Invalid {
+		return make(map[string]interface{}), nil
+	}
  	if rv.Kind() != reflect.Map {
  		return nil, error_{"map", v, path}
  	}

Index: schema/schema_test.go
=== modified file 'schema/schema_test.go'
--- schema/schema_test.go	2014-01-14 13:10:26 +0000
+++ schema/schema_test.go	2014-05-28 04:58:04 +0000
@@ -250,8 +250,8 @@
  	c.Assert(err, gc.ErrorMatches, "<path>: expected map, got int\\(42\\)")

out, err = sch.Coerce(nil, aPath)
-	c.Assert(out, gc.IsNil)
-	c.Assert(err, gc.ErrorMatches, "<path>: expected map, got nothing")
+	c.Assert(err, gc.IsNil)
+	c.Assert(out, gc.DeepEquals, map[interface{}]interface{}{})

out, err = sch.Coerce(map[int]int{1: 1}, aPath)
  	c.Assert(out, gc.IsNil)
@@ -274,12 +274,12 @@
  	c.Assert(out, gc.DeepEquals, map[string]interface{}{"a": int64(1), "b":  
int64(2)})

out, err = sch.Coerce(42, aPath)
-	c.Assert(out, gc.IsNil)
  	c.Assert(err, gc.ErrorMatches, "<path>: expected map, got int\\(42\\)")
+	c.Assert(out, gc.IsNil)

out, err = sch.Coerce(map[int]int{1: 1}, aPath)
  	c.Assert(out, gc.IsNil)
@@ -306,8 +306,8 @@
  	c.Assert(err, gc.ErrorMatches, "<path>: expected map, got int\\(42\\)")

out, err = sch.Coerce(map[string]interface{}{"a": "A", "b": "C"}, aPath)
  	c.Assert(out, gc.IsNil)
@@ -416,8 +416,8 @@
  	c.Assert(err, gc.ErrorMatches, `<path>: expected map, got int\(42\)`)

out, err = sch.Coerce(nil, aPath)
-	c.Assert(out, gc.IsNil)
-	c.Assert(err, gc.ErrorMatches, `<path>: expected map, got nothing`)
+	c.Assert(err, gc.IsNil)
+	c.Assert(out, gc.DeepEquals, map[string]interface{}{})

// First path entry shouldn't have dots in an error message.
  	out, err = sch.Coerce(map[string]int{"a": 1}, nil)

Index: testing/repo/quantal/empty-fields/metadata.yaml
=== added file 'testing/repo/quantal/empty-fields/metadata.yaml'
--- testing/repo/quantal/empty-fields/metadata.yaml	1970-01-01 00:00:00  
+0000
+++ testing/repo/quantal/empty-fields/metadata.yaml	2014-05-03 17:48:01  
+0000
@@ -0,0 +1,6 @@
+name: empty-fields
+summary: "Kerosene powered blender"
+description: "Description here"
+provides:
+peers:
+requires:

Revision history for this message

William Reade (fwereade) wrote on 2014-05-28:

LGTM apart from the serialisation change. What prompted that?

https://codereview.appspot.com/101810046/diff/1/charm/meta.go
File charm/meta.go (right):

https://codereview.appspot.com/101810046/diff/1/charm/meta.go#newcode101
charm/meta.go:101: Peers map[string]Relation
why did these change?

https://codereview.appspot.com/101810046/

Revision history for this message

Jimmie Butler (jimmiebtlr) wrote on 2014-05-28:

I'll change the serialization back, my thinking on that section was to be
more explicit. It does seem unnecessary though.
On May 28, 2014 3:57 AM, "William Reade" <email address hidden>
wrote:

> LGTM apart from the serialisation change. What prompted that?
>
>
> https://codereview.appspot.com/101810046/diff/1/charm/meta.go
> File charm/meta.go (right):
>
> https://codereview.appspot.com/101810046/diff/1/charm/meta.go#newcode101
> charm/meta.go:101: Peers map[string]Relation
> why did these change?
>
> https://codereview.appspot.com/101810046/
>
> --
>
> https://code.launchpad.net/~jimmiebtlr/juju-core/fix-no-peers-charms/+merge/221156
> You are the owner of lp:~jimmiebtlr/juju-core/fix-no-peers-charms.
>

Revision history for this message

Jimmie Butler (jimmiebtlr) wrote on 2014-05-29:

Please take a look.

https://codereview.appspot.com/101810046/

Revision history for this message

William Reade (fwereade) wrote on 2014-06-02:

LGTM, I'm approving this despite the unnecessary lines in the test. A
followup that just dropped those would be very much appreciated.

https://codereview.appspot.com/101810046/diff/20001/charm/meta_test.go
File charm/meta_test.go (right):

https://codereview.appspot.com/101810046/diff/20001/charm/meta_test.go#newcode407
charm/meta_test.go:407: empty_input.Requires = nil
Aren't these nil already?

https://codereview.appspot.com/101810046/

Revision history for this message

Go Bot (go-bot) wrote on 2014-06-02:

Download full text (64.8 KiB)

The attempt to merge lp:~jimmiebtlr/juju-core/fix-no-peers-charms into lp:juju-core failed. Below is the output from the failed tests.

ok  	launchpad.net/juju-core	0.024s
ok  	launchpad.net/juju-core/agent	0.923s
ok  	launchpad.net/juju-core/agent/mongo	0.484s
ok  	launchpad.net/juju-core/agent/tools	0.180s
ok  	launchpad.net/juju-core/audit	0.013s
ok  	launchpad.net/juju-core/bzr	5.142s
ok  	launchpad.net/juju-core/cert	2.623s
ok  	launchpad.net/juju-core/charm	0.414s
?   	launchpad.net/juju-core/charm/hooks	[no test files]
?   	launchpad.net/juju-core/charm/testing	[no test files]
ok  	launchpad.net/juju-core/cloudinit	0.174s
ok  	launchpad.net/juju-core/cloudinit/sshinit	0.765s
ok  	launchpad.net/juju-core/cmd	0.183s
ok  	launchpad.net/juju-core/cmd/charm-admin	0.244s
?   	launchpad.net/juju-core/cmd/charmd	[no test files]
?   	launchpad.net/juju-core/cmd/charmload	[no test files]
ok  	launchpad.net/juju-core/cmd/envcmd	0.167s
ok  	launchpad.net/juju-core/cmd/juju	162.882s
ok  	launchpad.net/juju-core/cmd/jujud	69.584s
ok  	launchpad.net/juju-core/cmd/plugins/juju-metadata	9.346s
?   	launchpad.net/juju-core/cmd/plugins/juju-restore	[no test files]
ok  	launchpad.net/juju-core/cmd/plugins/local	0.151s
?   	launchpad.net/juju-core/cmd/plugins/local/juju-local	[no test files]
ok  	launchpad.net/juju-core/constraints	0.023s
ok  	launchpad.net/juju-core/container	0.169s
ok  	launchpad.net/juju-core/container/factory	0.194s
ok  	launchpad.net/juju-core/container/kvm	0.166s
ok  	launchpad.net/juju-core/container/kvm/mock	0.162s
?   	launchpad.net/juju-core/container/kvm/testing	[no test files]
ok  	launchpad.net/juju-core/container/lxc	4.270s
?   	launchpad.net/juju-core/container/lxc/mock	[no test files]
?   	launchpad.net/juju-core/container/lxc/testing	[no test files]
?   	launchpad.net/juju-core/container/testing	[no test files]
ok  	launchpad.net/juju-core/downloader	5.193s
ok  	launchpad.net/juju-core/environs	2.002s
ok  	launchpad.net/juju-core/environs/bootstrap	3.981s
ok  	launchpad.net/juju-core/environs/cloudinit	0.518s
ok  	launchpad.net/juju-core/environs/config	1.605s
ok  	launchpad.net/juju-core/environs/configstore	0.177s
ok  	launchpad.net/juju-core/environs/filestorage	0.029s
ok  	launchpad.net/juju-core/environs/httpstorage	0.732s
ok  	launchpad.net/juju-core/environs/imagemetadata	0.519s
?   	launchpad.net/juju-core/environs/imagemetadata/testing	[no test files]
ok  	launchpad.net/juju-core/environs/instances	0.216s
ok  	launchpad.net/juju-core/environs/jujutest	0.162s
ok  	launchpad.net/juju-core/environs/manual	11.665s
?   	launchpad.net/juju-core/environs/network	[no test files]
ok  	launchpad.net/juju-core/environs/simplestreams	0.273s
?   	launchpad.net/juju-core/environs/simplestreams/testing	[no test files]
ok  	launchpad.net/juju-core/environs/sshstorage	1.162s
ok  	launchpad.net/juju-core/environs/storage	0.787s
ok  	launchpad.net/juju-core/environs/sync	41.865s
ok  	launchpad.net/juju-core/environs/testing	0.146s
ok  	launchpad.net/juju-core/environs/tools	4.741s
?   	launchpad.net/juju-core/environs/tools/testing	[no test files]
ok  	launchpad.net/juju-core/instance	0.145s
?   	launchpad.net/juju-core/instance/testing	[no test files]
ok  	launchpad.net/juju-core/juju	15.190s
ok  	launchpad.net/juju-core/juju/arch	0.159s
ok  	launchpad.net/juju-core/juju/osenv	0.128s
?   	launchpad.net/juju-core/juju/testing	[no test files]
ok  	launchpad.net/juju-core/names	0.019s
?   	launchpad.net/juju-core/provider	[no test files]
?   	launchpad.net/juju-core/provider/all	[no test files]
ok  	launchpad.net/juju-core/provider/azure	5.161s
ok  	launchpad.net/juju-core/provider/common	6.434s
ok  	launchpad.net/juju-core/provider/dummy	18.280s
ok  	launchpad.net/juju-core/provider/ec2	13.141s
ok  	launchpad.net/juju-core/provider/joyent	73.400s
ok  	launchpad.net/juju-core/provider/local	11.943s
ok  	launchpad.net/juju-core/provider/maas	11.237s
ok  	launchpad.net/juju-core/provider/manual	1.219s
ok  	launchpad.net/juju-core/provider/openstack	25.092s
ok  	launchpad.net/juju-core/replicaset	113.830s
ok  	launchpad.net/juju-core/rpc	0.241s
ok  	launchpad.net/juju-core/rpc/jsoncodec	0.168s
?   	launchpad.net/juju-core/rpc/rpcreflect	[no test files]
ok  	launchpad.net/juju-core/schema	0.021s
2014-06-02 09:19:31 INFO juju.testing mgo.go:464 reset successfully reset admin password
2014-06-02 09:20:04 INFO juju.testing mgo.go:464 reset successfully reset admin password
2014-06-02 09:20:29 INFO juju.testing mgo.go:464 reset successfully reset admin password

----------------------------------------------------------------------
FAIL: state_test.go:2014: StateSuite.TestAddAndGetEquivalence

[LOG] 0:00.003 INFO juju.state opening state, mongo addresses: ["localhost:59733"]; entity ""
[LOG] 0:00.004 DEBUG juju.state dialing mongo
[LOG] 0:00.005 INFO juju.state dialled mongo successfully
[LOG] 0:00.006 DEBUG juju.state connection established
[LOG] 0:00.023 INFO juju.state adding state server info to legacy environment
[LOG] 0:00.023 INFO juju.state found existing state servers []
[LOG] 0:00.036 INFO juju.state initializing environment
state_test.go:2032:
    c.Assert(charm1, jc.DeepEquals, charm2)
... obtained *state.Charm = &state.Charm{st:(*state.State)(0xc20058e240), doc:state.charmDoc{URL:(*charm.URL)(0xc200602410), Meta:(*charm.Meta)(0xc2006a25a0), Config:(*charm.Config)(0xc2006b3c20), BundleURL:(*url.URL)(0xc2005ddee0), BundleSha256:"quantal-wordpress-3-sha256", PendingUpload:false, Placeholder:false}} ("local:quantal/quantal-wordpress-3")
... expected *state.Charm = &state.Charm{st:(*state.State)(0xc20058e240), doc:state.charmDoc{URL:(*charm.URL)(0xc2002ca0f0), Meta:(*charm.Meta)(0xc200746ab0), Config:(*charm.Config)(0xc2007061d0), BundleURL:(*url.URL)(0xc2005db770), BundleSha256:"quantal-wordpress-3-sha256", PendingUpload:false, Placeholder:false}} ("local:quantal/quantal-wordpress-3")
... mismatch at (*(*).doc.Meta).Peers: nil vs non-nil mismatch; obtained map[string]charm.Relation{}; expected map[string]charm.Relation(nil)

[LOG] 0:00.101 INFO juju.testing reset successfully reset admin password

----------------------------------------------------------------------
FAIL: state_test.go:450: StateSuite.TestAddStoreCharmPlaceholderDeletesOlder

[LOG] 0:00.003 INFO juju.state opening state, mongo addresses: ["localhost:59733"]; entity ""
[LOG] 0:00.003 DEBUG juju.state dialing mongo
[LOG] 0:00.004 INFO juju.state dialled mongo successfully
[LOG] 0:00.005 DEBUG juju.state connection established
[LOG] 0:00.026 INFO juju.state adding state server info to legacy environment
[LOG] 0:00.026 INFO juju.state found existing state servers []
[LOG] 0:00.043 INFO juju.state initializing environment
state_test.go:451:
    curl, curlOldRef, dummy := s.assertAddStoreCharmPlaceholder(c)
state_test.go:441:
    c.Assert(existing, jc.DeepEquals, dummy)
... obtained *state.Charm = &state.Charm{st:(*state.State)(0xc2007cf7e0), doc:state.charmDoc{URL:(*charm.URL)(0xc200597190), Meta:(*charm.Meta)(0xc2007f95a0), Config:(*charm.Config)(0xc200765328), BundleURL:(*url.URL)(0xc2005f5b60), BundleSha256:"dummy-1-sha256", PendingUpload:false, Placeholder:false}} ("cs:quantal/dummy-1")
... expected *state.Charm = &state.Charm{st:(*state.State)(0xc2007cf7e0), doc:state.charmDoc{URL:(*charm.URL)(0xc2002ca690), Meta:(*charm.Meta)(0xc2001fe000), Config:(*charm.Config)(0xc20088a518), BundleURL:(*url.URL)(0xc2005a8af0), BundleSha256:"dummy-1-sha256", PendingUpload:false, Placeholder:false}} ("cs:quantal/dummy-1")
... mismatch at (*(*).doc.Meta).Provides: nil vs non-nil mismatch; obtained map[string]charm.Relation(nil); expected map[string]charm.Relation{}

[LOG] 0:00.128 INFO juju.testing reset successfully reset admin password

----------------------------------------------------------------------
FAIL: state_test.go:446: StateSuite.TestAddStoreCharmPlaceholderLeavesDeployedCharmsAlone

[LOG] 0:00.003 INFO juju.state opening state, mongo addresses: ["localhost:59733"]; entity ""
[LOG] 0:00.004 DEBUG juju.state dialing mongo
[LOG] 0:00.005 INFO juju.state dialled mongo successfully
[LOG] 0:00.006 DEBUG juju.state connection established
[LOG] 0:00.027 INFO juju.state adding state server info to legacy environment
[LOG] 0:00.027 INFO juju.state found existing state servers []
[LOG] 0:00.044 INFO juju.state initializing environment
state_test.go:447:
    s.assertAddStoreCharmPlaceholder(c)
state_test.go:441:
    c.Assert(existing, jc.DeepEquals, dummy)
... obtained *state.Charm = &state.Charm{st:(*state.State)(0xc200820240), doc:state.charmDoc{URL:(*charm.URL)(0xc2001e6870), Meta:(*charm.Meta)(0xc20065ca20), Config:(*charm.Config)(0xc2003a4620), BundleURL:(*url.URL)(0xc2005dd8c0), BundleSha256:"dummy-1-sha256", PendingUpload:false, Placeholder:false}} ("cs:quantal/dummy-1")
... expected *state.Charm = &state.Charm{st:(*state.State)(0xc200820240), doc:state.charmDoc{URL:(*charm.URL)(0xc2001e60a0), Meta:(*charm.Meta)(0xc2005e67e0), Config:(*charm.Config)(0xc2003bc868), BundleURL:(*url.URL)(0xc2005ffaf0), BundleSha256:"dummy-1-sha256", PendingUpload:false, Placeholder:false}} ("cs:quantal/dummy-1")
... mismatch at (*(*).doc.Meta).Provides: nil vs non-nil mismatch; obtained map[string]charm.Relation(nil); expected map[string]charm.Relation{}

[LOG] 0:00.143 INFO juju.testing reset successfully reset admin password

----------------------------------------------------------------------
FAIL: state_test.go:260: StateSuite.TestPrepareStoreCharmUpload

[LOG] 0:00.003 INFO juju.state opening state, mongo addresses: ["localhost:44065"]; entity ""
[LOG] 0:00.003 DEBUG juju.state dialing mongo
[LOG] 0:00.005 INFO juju.state dialled mongo successfully
[LOG] 0:00.005 DEBUG juju.state connection established
[LOG] 0:00.021 INFO juju.state adding state server info to legacy environment
[LOG] 0:00.021 INFO juju.state found existing state servers []
[LOG] 0:00.034 INFO juju.state initializing environment
state.CharmDoc{URL:(*charm.URL)(0xc200467b90), Meta:(*charm.Meta)(nil), Config:(*charm.Config)(nil), BundleURL:(*url.URL)(nil), BundleSha256:"", PendingUpload:true, Placeholder:false}
state_test.go:290:
    c.Assert(sch, jc.DeepEquals, schCopy)
... obtained *state.Charm = &state.Charm{st:(*state.State)(0xc200772240), doc:state.charmDoc{URL:(*charm.URL)(0xc2004512d0), Meta:(*charm.Meta)(0xc20065c750), Config:(*charm.Config)(0xc2004312f8), BundleURL:(*url.URL)(0xc2002b98c0), BundleSha256:"dummy-1-sha256", PendingUpload:false, Placeholder:false}} ("cs:precise/dummy-2")
... expected *state.Charm = &state.Charm{st:(*state.State)(0xc200772240), doc:state.charmDoc{URL:(*charm.URL)(0xc200451410), Meta:(*charm.Meta)(0xc20051aab0), Config:(*charm.Config)(0xc200431738), BundleURL:(*url.URL)(0xc2002242a0), BundleSha256:"dummy-1-sha256", PendingUpload:false, Placeholder:false}} ("cs:precise/dummy-2")
... mismatch at (*(*).doc.Meta).Provides: nil vs non-nil mismatch; obtained map[string]charm.Relation{}; expected map[string]charm.Relation(nil)

[LOG] 0:00.094 INFO juju.testing reset successfully reset admin password
2014-06-02 09:20:48 INFO juju.testing mgo.go:464 reset successfully reset admin password

----------------------------------------------------------------------
FAIL: state_test.go:325: StateSuite.TestUpdateUploadedCharm

[LOG] 0:00.003 INFO juju.state opening state, mongo addresses: ["localhost:44065"]; entity ""
[LOG] 0:00.003 DEBUG juju.state dialing mongo
[LOG] 0:00.005 INFO juju.state dialled mongo successfully
[LOG] 0:00.006 DEBUG juju.state connection established
[LOG] 0:00.021 INFO juju.state adding state server info to legacy environment
[LOG] 0:00.021 INFO juju.state found existing state servers []
[LOG] 0:00.034 INFO juju.state initializing environment
state_test.go:348:
    c.Assert(sch.Meta(), gc.DeepEquals, ch.Meta())
... obtained *charm.Meta = &charm.Meta{Name:"dummy", Summary:"That's a dummy charm.", Description:"This is a longer description which\npotentially contains multiple lines.\n", Subordinate:false, Provides:map[string]charm.Relation(nil), Requires:map[string]charm.Relation(nil), Peers:map[string]charm.Relation(nil), Format:1, OldRevision:0, Categories:[]string(nil), Series:""}
... expected *charm.Meta = &charm.Meta{Name:"dummy", Summary:"That's a dummy charm.", Description:"This is a longer description which\npotentially contains multiple lines.\n", Subordinate:false, Provides:map[string]charm.Relation{}, Requires:map[string]charm.Relation{}, Peers:map[string]charm.Relation{}, Format:1, OldRevision:0, Categories:[]string(nil), Series:""}

[LOG] 0:00.095 INFO juju.testing reset successfully reset admin password
OOPS: 470 passed, 5 FAILED
--- FAIL: TestPackage (100.21 seconds)
FAIL
FAIL	launchpad.net/juju-core/state	100.385s
ok  	launchpad.net/juju-core/state/api	5.040s
ok  	launchpad.net/juju-core/state/api/agent	2.393s
?   	launchpad.net/juju-core/state/api/base	[no test files]
ok  	launchpad.net/juju-core/state/api/charmrevisionupdater	0.873s
?   	launchpad.net/juju-core/state/api/common	[no test files]
ok  	launchpad.net/juju-core/state/api/deployer	5.961s
ok  	launchpad.net/juju-core/state/api/environment	1.209s
ok  	launchpad.net/juju-core/state/api/firewaller	9.413s
ok  	launchpad.net/juju-core/state/api/keymanager	3.229s
ok  	launchpad.net/juju-core/state/api/keyupdater	1.653s
ok  	launchpad.net/juju-core/state/api/logger	1.511s
ok  	launchpad.net/juju-core/state/api/machiner	3.680s
ok  	launchpad.net/juju-core/state/api/params	0.037s
ok  	launchpad.net/juju-core/state/api/provisioner	11.651s
ok  	launchpad.net/juju-core/state/api/rsyslog	1.053s
?   	launchpad.net/juju-core/state/api/testing	[no test files]
ok  	launchpad.net/juju-core/state/api/uniter	27.758s
ok  	launchpad.net/juju-core/state/api/upgrader	8.282s
ok  	launchpad.net/juju-core/state/api/usermanager	1.395s
ok  	launchpad.net/juju-core/state/api/watcher	2.449s

----------------------------------------------------------------------
FAIL: charms_test.go:229: charmsSuite.TestUploadRepackagesNestedArchives

[LOG] 0:00.018 DEBUG juju.environs.configstore Making /tmp/jctest.4DC/gocheck-8674665223082153551/60/home/ubuntu/.juju/environments
[LOG] 0:00.092 INFO juju.environs.testing uploading FAKE tools 1.19.3-precise-amd64
[LOG] 0:00.093 INFO juju.environs.testing uploading FAKE tools 1.19.3-precise-amd64
[LOG] 0:00.099 INFO juju.environs.testing uploading FAKE tools 1.19.3-precise-amd64
[LOG] 0:00.099 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 0:00.099 DEBUG juju.environs.tools no series specified when finding tools, looking for any
[LOG] 0:00.099 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not found
[LOG] 0:00.099 DEBUG juju.environs.simplestreams cannot load index "streams/v1/index.sjson": invalid URL "tools/streams/v1/index.sjson" not found
[LOG] 0:00.099 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/index.json": file "tools/streams/v1/index.json" not found not found
[LOG] 0:00.099 DEBUG juju.environs.simplestreams cannot load index "streams/v1/index.json": invalid URL "tools/streams/v1/index.json" not found
[LOG] 0:00.099 INFO juju.environs.tools Writing tools/streams/v1/index.json
[LOG] 0:00.099 INFO juju.environs.tools Writing tools/streams/v1/com.ubuntu.juju:released:tools.json
[LOG] 0:00.099 DEBUG juju.environs.bootstrap environment "dummyenv" supports service/machine networks: true
[LOG] 0:00.100 INFO juju.environs.bootstrap bootstrapping environment "dummyenv"
[LOG] 0:00.100 DEBUG juju.environs.bootstrap looking for bootstrap tools: series="precise", arch=<nil>, version=1.19.3
[LOG] 0:00.100 INFO juju.environs.tools reading tools with major.minor version 1.19
[LOG] 0:00.100 INFO juju.environs.tools filtering tools by version: 1.19.3
[LOG] 0:00.100 INFO juju.environs.tools filtering tools by series: precise
[LOG] 0:00.100 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 0:00.100 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not found
[LOG] 0:00.100 DEBUG juju.environs.simplestreams cannot load index "streams/v1/index.sjson": invalid URL "tools/streams/v1/index.sjson" not found
[LOG] 0:00.100 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/mirrors.json": file "tools/streams/v1/mirrors.json" not found not found
[LOG] 0:00.100 DEBUG juju.environs.simplestreams no mirror index file found
[LOG] 0:00.100 DEBUG juju.environs.simplestreams no mirror information available for { }: mirror data for "com.ubuntu.juju:released:tools" not found
[LOG] 0:00.100 DEBUG juju.environs.simplestreams read metadata index at "http://127.0.0.1:48708/dummyenv/private/tools/streams/v1/index.json"
[LOG] 0:00.100 DEBUG juju.environs.simplestreams candidate matches for products ["com.ubuntu.juju:12.04:amd64" "com.ubuntu.juju:12.04:i386" "com.ubuntu.juju:12.04:armhf" "com.ubuntu.juju:12.04:arm64" "com.ubuntu.juju:12.04:ppc64"] are [{Mon, 02 Jun 2014 09:22:16 +0000 products:1.0 content-download  [] streams/v1/com.ubuntu.juju:released:tools.json [com.ubuntu.juju:12.04:amd64]}]
[LOG] 0:00.100 DEBUG juju.environs.simplestreams finding products at path "streams/v1/com.ubuntu.juju:released:tools.json"
[LOG] 0:00.100 DEBUG juju.environs.simplestreams metadata: &{map[com.ubuntu.juju:12.04:amd64:{ 1.19.3 amd64   map[20140602:0xc20082d2a0]}] map[] Mon, 02 Jun 2014 09:22:16 +0000 products:1.0 com.ubuntu.juju:released:tools}
[LOG] 0:00.100 INFO juju.environs.bootstrap newest version: 1.19.3
[LOG] 0:00.100 INFO juju.environs.bootstrap picked bootstrap tools version: 1.19.3
[LOG] 0:00.100 INFO juju.provider.dummy would pick tools from 1.19.3-precise-amd64
[LOG] 0:00.100 DEBUG juju.environs.bootstrap putting "provider-state" to bootstrap storage *dummy.dummyStorage
[LOG] 0:00.100 INFO juju.state opening state, mongo addresses: ["localhost:53828"]; entity ""
[LOG] 0:00.101 DEBUG juju.state dialing mongo
[LOG] 0:00.102 INFO juju.state dialled mongo successfully
[LOG] 0:00.103 DEBUG juju.state connection established
[LOG] 0:00.121 INFO juju.state adding state server info to legacy environment
[LOG] 0:00.121 INFO juju.state found existing state servers []
[LOG] 0:00.134 INFO juju.state initializing environment
[LOG] 0:00.161 INFO juju.state.apiserver listening on "127.0.0.1:36285"
[LOG] 0:00.177 INFO juju.state opening state, mongo addresses: ["localhost:53828"]; entity ""
[LOG] 0:00.177 DEBUG juju.state dialing mongo
[LOG] 0:00.181 INFO juju.state dialled mongo successfully
[LOG] 0:00.182 DEBUG juju.state connection established
[LOG] 0:00.183 INFO juju.conn authorization error while connecting to state server; retrying
[LOG] 0:00.183 INFO juju.state opening state, mongo addresses: ["localhost:53828"]; entity ""
[LOG] 0:00.183 DEBUG juju.state dialing mongo
[LOG] 0:00.185 INFO juju.state dialled mongo successfully
[LOG] 0:00.186 DEBUG juju.state connection established
[LOG] 0:00.191 INFO juju.state adding state server info to legacy environment
[LOG] 0:00.191 INFO juju.state found existing state servers []
[LOG] 0:00.229 INFO juju.state.api dialing "wss://127.0.0.1:36285/"
[LOG] 0:00.232 INFO juju.state.apiserver [E] API connection from 127.0.0.1:36801
[LOG] 0:00.232 INFO juju.state.api connection established to "wss://127.0.0.1:36285/"
[LOG] 0:00.232 DEBUG juju.state.apiserver <- [E] <unknown> {"RequestId":1,"Type":"Admin","Request":"Login","Params":{"AuthTag":"user-admin","Password":"dummy-secret","Nonce":""}}
[LOG] 0:00.232 DEBUG juju.state.apiserver hostPorts: []
[LOG] 0:00.232 DEBUG juju.state.apiserver -> [E] user-admin 518.111us {"RequestId":1,"Response":{"Servers":[]}} Admin[""].Login
[LOG] 0:00.263 INFO juju.utils hostname SSL verification disabled
charms_test.go:282:
    c.Assert(bundle.Meta(), jc.DeepEquals, sch.Meta())
... obtained *charm.Meta = &charm.Meta{Name:"dummy", Summary:"That's a dummy charm.", Description:"This is a longer description which\npotentially contains multiple lines.\n", Subordinate:false, Provides:map[string]charm.Relation{}, Requires:map[string]charm.Relation{}, Peers:map[string]charm.Relation{}, Format:1, OldRevision:0, Categories:[]string(nil), Series:""}
... expected *charm.Meta = &charm.Meta{Name:"dummy", Summary:"That's a dummy charm.", Description:"This is a longer description which\npotentially contains multiple lines.\n", Subordinate:false, Provides:map[string]charm.Relation(nil), Requires:map[string]charm.Relation(nil), Peers:map[string]charm.Relation(nil), Format:1, OldRevision:0, Categories:[]string(nil), Series:""}
... mismatch at (*).Provides: nil vs non-nil mismatch; obtained map[string]charm.Relation{}; expected map[string]charm.Relation(nil)

[LOG] 0:00.305 INFO juju.provider.dummy reset environment
[LOG] 0:00.305 INFO juju.state.apiserver [E] user-admin API connection terminated after 73.591322ms
[LOG] 0:00.308 INFO juju.testing reset successfully reset admin password
[LOG] 0:00.328 INFO juju.testing reset successfully reset admin password
[LOG] 0:00.331 INFO juju.testing reset successfully reset admin password
OOPS: 73 passed, 1 FAILED
--- FAIL: TestAll (17.70 seconds)
FAIL
FAIL	launchpad.net/juju-core/state/apiserver	17.877s
ok  	launchpad.net/juju-core/state/apiserver/agent	2.312s
ok  	launchpad.net/juju-core/state/apiserver/charmrevisionupdater	1.797s
?   	launchpad.net/juju-core/state/apiserver/charmrevisionupdater/testing	[no test files]

----------------------------------------------------------------------
FAIL: client_test.go:238: clientSuite.TestClientCharmInfo

[LOG] 0:00.020 DEBUG juju.environs.configstore Making /tmp/jctest.4DC/gocheck-5577006791947779410/104/home/ubuntu/.juju/environments
[LOG] 0:00.094 INFO juju.environs.testing uploading FAKE tools 1.19.3-precise-amd64
[LOG] 0:00.101 INFO juju.environs.testing uploading FAKE tools 1.19.3-precise-amd64
[LOG] 0:00.108 INFO juju.environs.testing uploading FAKE tools 1.19.3-precise-amd64
[LOG] 0:00.108 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 0:00.108 DEBUG juju.environs.tools no series specified when finding tools, looking for any
[LOG] 0:00.108 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not found
[LOG] 0:00.108 DEBUG juju.environs.simplestreams cannot load index "streams/v1/index.sjson": invalid URL "tools/streams/v1/index.sjson" not found
[LOG] 0:00.108 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/index.json": file "tools/streams/v1/index.json" not found not found
[LOG] 0:00.108 DEBUG juju.environs.simplestreams cannot load index "streams/v1/index.json": invalid URL "tools/streams/v1/index.json" not found
[LOG] 0:00.109 INFO juju.environs.tools Writing tools/streams/v1/index.json
[LOG] 0:00.109 INFO juju.environs.tools Writing tools/streams/v1/com.ubuntu.juju:released:tools.json
[LOG] 0:00.109 DEBUG juju.environs.bootstrap environment "dummyenv" supports service/machine networks: true
[LOG] 0:00.109 INFO juju.environs.bootstrap bootstrapping environment "dummyenv"
[LOG] 0:00.109 DEBUG juju.environs.bootstrap looking for bootstrap tools: series="precise", arch=<nil>, version=1.19.3
[LOG] 0:00.109 INFO juju.environs.tools reading tools with major.minor version 1.19
[LOG] 0:00.109 INFO juju.environs.tools filtering tools by version: 1.19.3
[LOG] 0:00.109 INFO juju.environs.tools filtering tools by series: precise
[LOG] 0:00.109 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 0:00.109 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not found
[LOG] 0:00.109 DEBUG juju.environs.simplestreams cannot load index "streams/v1/index.sjson": invalid URL "tools/streams/v1/index.sjson" not found
[LOG] 0:00.109 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/mirrors.json": file "tools/streams/v1/mirrors.json" not found not found
[LOG] 0:00.109 DEBUG juju.environs.simplestreams no mirror index file found
[LOG] 0:00.109 DEBUG juju.environs.simplestreams no mirror information available for { }: mirror data for "com.ubuntu.juju:released:tools" not found
[LOG] 0:00.109 DEBUG juju.environs.simplestreams read metadata index at "http://127.0.0.1:53957/dummyenv/private/tools/streams/v1/index.json"
[LOG] 0:00.109 DEBUG juju.environs.simplestreams candidate matches for products ["com.ubuntu.juju:12.04:amd64" "com.ubuntu.juju:12.04:i386" "com.ubuntu.juju:12.04:armhf" "com.ubuntu.juju:12.04:arm64" "com.ubuntu.juju:12.04:ppc64"] are [{Mon, 02 Jun 2014 09:22:35 +0000 products:1.0 content-download  [] streams/v1/com.ubuntu.juju:released:tools.json [com.ubuntu.juju:12.04:amd64]}]
[LOG] 0:00.109 DEBUG juju.environs.simplestreams finding products at path "streams/v1/com.ubuntu.juju:released:tools.json"
[LOG] 0:00.109 DEBUG juju.environs.simplestreams metadata: &{map[com.ubuntu.juju:12.04:amd64:{ 1.19.3 amd64   map[20140602:0xc2009ffc60]}] map[] Mon, 02 Jun 2014 09:22:35 +0000 products:1.0 com.ubuntu.juju:released:tools}
[LOG] 0:00.109 INFO juju.environs.bootstrap newest version: 1.19.3
[LOG] 0:00.109 INFO juju.environs.bootstrap picked bootstrap tools version: 1.19.3
[LOG] 0:00.109 INFO juju.provider.dummy would pick tools from 1.19.3-precise-amd64
[LOG] 0:00.110 DEBUG juju.environs.bootstrap putting "provider-state" to bootstrap storage *dummy.dummyStorage
[LOG] 0:00.110 INFO juju.state opening state, mongo addresses: ["localhost:51358"]; entity ""
[LOG] 0:00.110 DEBUG juju.state dialing mongo
[LOG] 0:00.112 INFO juju.state dialled mongo successfully
[LOG] 0:00.112 DEBUG juju.state connection established
[LOG] 0:00.129 INFO juju.state adding state server info to legacy environment
[LOG] 0:00.130 INFO juju.state found existing state servers []
[LOG] 0:00.142 INFO juju.state initializing environment
[LOG] 0:00.169 INFO juju.state.apiserver listening on "127.0.0.1:33345"
[LOG] 0:00.183 INFO juju.state opening state, mongo addresses: ["localhost:51358"]; entity ""
[LOG] 0:00.183 DEBUG juju.state dialing mongo
[LOG] 0:00.185 INFO juju.state dialled mongo successfully
[LOG] 0:00.186 DEBUG juju.state connection established
[LOG] 0:00.187 INFO juju.conn authorization error while connecting to state server; retrying
[LOG] 0:00.187 INFO juju.state opening state, mongo addresses: ["localhost:51358"]; entity ""
[LOG] 0:00.187 DEBUG juju.state dialing mongo
[LOG] 0:00.190 INFO juju.state dialled mongo successfully
[LOG] 0:00.190 DEBUG juju.state connection established
[LOG] 0:00.195 INFO juju.state adding state server info to legacy environment
[LOG] 0:00.195 INFO juju.state found existing state servers []
[LOG] 0:00.236 INFO juju.state.api dialing "wss://127.0.0.1:33345/"
[LOG] 0:00.238 INFO juju.state.apiserver [1A] API connection from 127.0.0.1:45596
[LOG] 0:00.239 INFO juju.state.api connection established to "wss://127.0.0.1:33345/"
[LOG] 0:00.239 DEBUG juju.state.apiserver <- [1A] <unknown> {"RequestId":1,"Type":"Admin","Request":"Login","Params":{"AuthTag":"user-admin","Password":"dummy-secret","Nonce":""}}
[LOG] 0:00.239 DEBUG juju.state.apiserver hostPorts: []
[LOG] 0:00.239 DEBUG juju.state.apiserver -> [1A] user-admin 564.686us {"RequestId":1,"Response":{"Servers":[]}} Admin[""].Login
[LOG] 0:00.245 INFO juju.conn writing charm to storage [853 bytes]
[LOG] 0:00.245 INFO juju.conn adding charm to state
test 0. retrieves charm info
[LOG] 0:00.246 DEBUG juju.state.apiserver <- [1A] user-admin {"RequestId":3,"Type":"Client","Request":"CharmInfo","Params":{"CharmURL":"local:quantal/wordpress-3"}}
[LOG] 0:00.246 DEBUG juju.state.apiserver -> [1A] user-admin 491.47us {"RequestId":3,"Response":{"Revision":3,"URL":"local:quantal/wordpress-3","Config":{"Options":{"blog-title":{"Type":"string","Description":"A descriptive title used for the blog.","Default":"My Title"}}},"Meta":{"Name":"wordpress","Summary":"Blog engine","Description":"A pretty popular blog engine","Subordinate":false,"Provides":{"logging-dir":{"Name":"logging-dir","Role":"provider","Interface":"logging","Optional":false,"Limit":0,"Scope":"container"},"monitoring-port":{"Name":"monitoring-port","Role":"provider","Interface":"monitoring","Optional":false,"Limit":0,"Scope":"container"},"url":{"Name":"url","Role":"provider","Interface":"http","Optional":false,"Limit":0,"Scope":"global"}},"Requires":{"cache":{"Name":"cache","Role":"requirer","Interface":"varnish","Optional":true,"Limit":2,"Scope":"global"},"db":{"Name":"db","Role":"requirer","Interface":"mysql","Optional":false,"Limit":1,"Scope":"global"}},"Peers":null,"Format":1,"OldRevision":0,"Categories":null,"Series":""}}} Client[""].CharmInfo
client_test.go:255:
    c.Assert(info, gc.DeepEquals, expected)
... obtained *api.CharmInfo = &api.CharmInfo{Revision:3, URL:"local:quantal/wordpress-3", Config:(*charm.Config)(0xc2009dc9e8), Meta:(*charm.Meta)(0xc200db73f0)}
... expected *api.CharmInfo = &api.CharmInfo{Revision:3, URL:"local:quantal/wordpress-3", Config:(*charm.Config)(0xc2009f4dc8), Meta:(*charm.Meta)(0xc2007d47e0)}

[LOG] 0:00.265 INFO juju.provider.dummy reset environment
[LOG] 0:00.265 INFO juju.state.apiserver [1A] user-admin API connection terminated after 26.781877ms
[LOG] 0:00.269 INFO juju.testing reset successfully reset admin password
[LOG] 0:00.273 INFO juju.testing reset successfully reset admin password
[LOG] 0:00.276 INFO juju.testing reset successfully reset admin password

----------------------------------------------------------------------
FAIL: client_test.go:737: clientSuite.TestClientServiceDeployPrincipal

[LOG] 0:00.016 DEBUG juju.environs.configstore Making /tmp/jctest.4DC/gocheck-5577006791947779410/214/home/ubuntu/.juju/environments
[LOG] 0:00.074 INFO juju.environs.testing uploading FAKE tools 1.19.3-precise-amd64
[LOG] 0:00.074 INFO juju.environs.testing uploading FAKE tools 1.19.3-precise-amd64
[LOG] 0:00.082 INFO juju.environs.testing uploading FAKE tools 1.19.3-precise-amd64
[LOG] 0:00.082 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 0:00.083 DEBUG juju.environs.tools no series specified when finding tools, looking for any
[LOG] 0:00.083 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not found
[LOG] 0:00.083 DEBUG juju.environs.simplestreams cannot load index "streams/v1/index.sjson": invalid URL "tools/streams/v1/index.sjson" not found
[LOG] 0:00.083 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/index.json": file "tools/streams/v1/index.json" not found not found
[LOG] 0:00.083 DEBUG juju.environs.simplestreams cannot load index "streams/v1/index.json": invalid URL "tools/streams/v1/index.json" not found
[LOG] 0:00.083 INFO juju.environs.tools Writing tools/streams/v1/index.json
[LOG] 0:00.083 INFO juju.environs.tools Writing tools/streams/v1/com.ubuntu.juju:released:tools.json
[LOG] 0:00.083 DEBUG juju.environs.bootstrap environment "dummyenv" supports service/machine networks: true
[LOG] 0:00.083 INFO juju.environs.bootstrap bootstrapping environment "dummyenv"
[LOG] 0:00.083 DEBUG juju.environs.bootstrap looking for bootstrap tools: series="precise", arch=<nil>, version=1.19.3
[LOG] 0:00.083 INFO juju.environs.tools reading tools with major.minor version 1.19
[LOG] 0:00.083 INFO juju.environs.tools filtering tools by version: 1.19.3
[LOG] 0:00.083 INFO juju.environs.tools filtering tools by series: precise
[LOG] 0:00.083 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 0:00.083 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not found
[LOG] 0:00.083 DEBUG juju.environs.simplestreams cannot load index "streams/v1/index.sjson": invalid URL "tools/streams/v1/index.sjson" not found
[LOG] 0:00.083 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/mirrors.json": file "tools/streams/v1/mirrors.json" not found not found
[LOG] 0:00.083 DEBUG juju.environs.simplestreams no mirror index file found
[LOG] 0:00.083 DEBUG juju.environs.simplestreams no mirror information available for { }: mirror data for "com.ubuntu.juju:released:tools" not found
[LOG] 0:00.083 DEBUG juju.environs.simplestreams read metadata index at "http://127.0.0.1:46785/dummyenv/private/tools/streams/v1/index.json"
[LOG] 0:00.083 DEBUG juju.environs.simplestreams candidate matches for products ["com.ubuntu.juju:12.04:amd64" "com.ubuntu.juju:12.04:i386" "com.ubuntu.juju:12.04:armhf" "com.ubuntu.juju:12.04:arm64" "com.ubuntu.juju:12.04:ppc64"] are [{Mon, 02 Jun 2014 09:22:45 +0000 products:1.0 content-download  [] streams/v1/com.ubuntu.juju:released:tools.json [com.ubuntu.juju:12.04:amd64]}]
[LOG] 0:00.083 DEBUG juju.environs.simplestreams finding products at path "streams/v1/com.ubuntu.juju:released:tools.json"
[LOG] 0:00.083 DEBUG juju.environs.simplestreams metadata: &{map[com.ubuntu.juju:12.04:amd64:{ 1.19.3 amd64   map[20140602:0xc200752540]}] map[] Mon, 02 Jun 2014 09:22:45 +0000 products:1.0 com.ubuntu.juju:released:tools}
[LOG] 0:00.083 INFO juju.environs.bootstrap newest version: 1.19.3
[LOG] 0:00.083 INFO juju.environs.bootstrap picked bootstrap tools version: 1.19.3
[LOG] 0:00.083 INFO juju.provider.dummy would pick tools from 1.19.3-precise-amd64
[LOG] 0:00.084 DEBUG juju.environs.bootstrap putting "provider-state" to bootstrap storage *dummy.dummyStorage
[LOG] 0:00.084 INFO juju.state opening state, mongo addresses: ["localhost:51358"]; entity ""
[LOG] 0:00.084 DEBUG juju.state dialing mongo
[LOG] 0:00.086 INFO juju.state dialled mongo successfully
[LOG] 0:00.087 DEBUG juju.state connection established
[LOG] 0:00.127 INFO juju.state adding state server info to legacy environment
[LOG] 0:00.128 INFO juju.state found existing state servers []
[LOG] 0:00.155 INFO juju.state initializing environment
[LOG] 0:00.205 INFO juju.state.apiserver listening on "127.0.0.1:41015"
[LOG] 0:00.219 INFO juju.state opening state, mongo addresses: ["localhost:51358"]; entity ""
[LOG] 0:00.220 DEBUG juju.state dialing mongo
[LOG] 0:00.221 INFO juju.state dialled mongo successfully
[LOG] 0:00.222 DEBUG juju.state connection established
[LOG] 0:00.235 INFO juju.conn authorization error while connecting to state server; retrying
[LOG] 0:00.235 INFO juju.state opening state, mongo addresses: ["localhost:51358"]; entity ""
[LOG] 0:00.235 DEBUG juju.state dialing mongo
[LOG] 0:00.237 INFO juju.state dialled mongo successfully
[LOG] 0:00.238 DEBUG juju.state connection established
[LOG] 0:00.244 INFO juju.state adding state server info to legacy environment
[LOG] 0:00.245 INFO juju.state found existing state servers []
[LOG] 0:00.278 INFO juju.state.api dialing "wss://127.0.0.1:41015/"
[LOG] 0:00.280 INFO juju.state.apiserver [35] API connection from 127.0.0.1:54604
[LOG] 0:00.281 INFO juju.state.api connection established to "wss://127.0.0.1:41015/"
[LOG] 0:00.281 DEBUG juju.state.apiserver <- [35] <unknown> {"RequestId":1,"Type":"Admin","Request":"Login","Params":{"AuthTag":"user-admin","Password":"dummy-secret","Nonce":""}}
[LOG] 0:00.281 DEBUG juju.state.apiserver hostPorts: []
[LOG] 0:00.281 DEBUG juju.state.apiserver -> [35] user-admin 461.867us {"RequestId":1,"Response":{"Servers":[]}} Admin[""].Login
[LOG] 0:00.291 DEBUG juju.state.apiserver <- [35] user-admin {"RequestId":3,"Type":"Client","Request":"ServiceDeploy","Params":{"ServiceName":"service","CharmUrl":"cs:precise/dummy-1","NumUnits":3,"Config":null,"ConfigYAML":"","Constraints":{"mem":4096},"ToMachineSpec":"","IncludeNetworks":null,"ExcludeNetworks":null}}
[LOG] 0:00.450 DEBUG juju.state.apiserver -> [35] user-admin 159.942438ms {"RequestId":3,"Response":{}} Client[""].ServiceDeploy
client_test.go:748:
    s.assertPrincipalDeployed(c, "service", curl, false, bundle, mem4g)
client_test.go:717:
    c.Assert(charm.Meta(), gc.DeepEquals, bundle.Meta())
... obtained *charm.Meta = &charm.Meta{Name:"dummy", Summary:"That's a dummy charm.", Description:"This is a longer description which\npotentially contains multiple lines.\n", Subordinate:false, Provides:map[string]charm.Relation(nil), Requires:map[string]charm.Relation(nil), Peers:map[string]charm.Relation(nil), Format:1, OldRevision:0, Categories:[]string(nil), Series:""}
... expected *charm.Meta = &charm.Meta{Name:"dummy", Summary:"That's a dummy charm.", Description:"This is a longer description which\npotentially contains multiple lines.\n", Subordinate:false, Provides:map[string]charm.Relation{}, Requires:map[string]charm.Relation{}, Peers:map[string]charm.Relation{}, Format:1, OldRevision:0, Categories:[]string(nil), Series:""}

[LOG] 0:00.474 INFO juju.provider.dummy reset environment
[LOG] 0:00.474 INFO juju.state.apiserver [35] user-admin API connection terminated after 193.894617ms
[LOG] 0:00.489 INFO juju.testing reset successfully reset admin password
[LOG] 0:00.497 INFO juju.testing reset successfully reset admin password
[LOG] 0:00.505 INFO juju.testing reset successfully reset admin password

----------------------------------------------------------------------
FAIL: client_test.go:751: clientSuite.TestClientServiceDeploySubordinate

[LOG] 0:00.016 DEBUG juju.environs.configstore Making /tmp/jctest.4DC/gocheck-5577006791947779410/224/home/ubuntu/.juju/environments
[LOG] 0:00.082 INFO juju.environs.testing uploading FAKE tools 1.19.3-precise-amd64
[LOG] 0:00.083 INFO juju.environs.testing uploading FAKE tools 1.19.3-precise-amd64
[LOG] 0:00.083 INFO juju.environs.testing uploading FAKE tools 1.19.3-precise-amd64
[LOG] 0:00.084 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 0:00.084 DEBUG juju.environs.tools no series specified when finding tools, looking for any
[LOG] 0:00.084 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not found
[LOG] 0:00.084 DEBUG juju.environs.simplestreams cannot load index "streams/v1/index.sjson": invalid URL "tools/streams/v1/index.sjson" not found
[LOG] 0:00.084 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/index.json": file "tools/streams/v1/index.json" not found not found
[LOG] 0:00.084 DEBUG juju.environs.simplestreams cannot load index "streams/v1/index.json": invalid URL "tools/streams/v1/index.json" not found
[LOG] 0:00.084 INFO juju.environs.tools Writing tools/streams/v1/index.json
[LOG] 0:00.084 INFO juju.environs.tools Writing tools/streams/v1/com.ubuntu.juju:released:tools.json
[LOG] 0:00.084 DEBUG juju.environs.bootstrap environment "dummyenv" supports service/machine networks: true
[LOG] 0:00.084 INFO juju.environs.bootstrap bootstrapping environment "dummyenv"
[LOG] 0:00.084 DEBUG juju.environs.bootstrap looking for bootstrap tools: series="precise", arch=<nil>, version=1.19.3
[LOG] 0:00.084 INFO juju.environs.tools reading tools with major.minor version 1.19
[LOG] 0:00.084 INFO juju.environs.tools filtering tools by version: 1.19.3
[LOG] 0:00.084 INFO juju.environs.tools filtering tools by series: precise
[LOG] 0:00.084 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 0:00.084 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not found
[LOG] 0:00.084 DEBUG juju.environs.simplestreams cannot load index "streams/v1/index.sjson": invalid URL "tools/streams/v1/index.sjson" not found
[LOG] 0:00.084 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/mirrors.json": file "tools/streams/v1/mirrors.json" not found not found
[LOG] 0:00.084 DEBUG juju.environs.simplestreams no mirror index file found
[LOG] 0:00.084 DEBUG juju.environs.simplestreams no mirror information available for { }: mirror data for "com.ubuntu.juju:released:tools" not found
[LOG] 0:00.084 DEBUG juju.environs.simplestreams read metadata index at "http://127.0.0.1:50990/dummyenv/private/tools/streams/v1/index.json"
[LOG] 0:00.084 DEBUG juju.environs.simplestreams candidate matches for products ["com.ubuntu.juju:12.04:amd64" "com.ubuntu.juju:12.04:i386" "com.ubuntu.juju:12.04:armhf" "com.ubuntu.juju:12.04:arm64" "com.ubuntu.juju:12.04:ppc64"] are [{Mon, 02 Jun 2014 09:22:46 +0000 products:1.0 content-download  [] streams/v1/com.ubuntu.juju:released:tools.json [com.ubuntu.juju:12.04:amd64]}]
[LOG] 0:00.084 DEBUG juju.environs.simplestreams finding products at path "streams/v1/com.ubuntu.juju:released:tools.json"
[LOG] 0:00.084 DEBUG juju.environs.simplestreams metadata: &{map[com.ubuntu.juju:12.04:amd64:{ 1.19.3 amd64   map[20140602:0xc20059e960]}] map[] Mon, 02 Jun 2014 09:22:46 +0000 products:1.0 com.ubuntu.juju:released:tools}
[LOG] 0:00.084 INFO juju.environs.bootstrap newest version: 1.19.3
[LOG] 0:00.084 INFO juju.environs.bootstrap picked bootstrap tools version: 1.19.3
[LOG] 0:00.085 INFO juju.provider.dummy would pick tools from 1.19.3-precise-amd64
[LOG] 0:00.085 DEBUG juju.environs.bootstrap putting "provider-state" to bootstrap storage *dummy.dummyStorage
[LOG] 0:00.085 INFO juju.state opening state, mongo addresses: ["localhost:51358"]; entity ""
[LOG] 0:00.085 DEBUG juju.state dialing mongo
[LOG] 0:00.086 INFO juju.state dialled mongo successfully
[LOG] 0:00.087 DEBUG juju.state connection established
[LOG] 0:00.116 INFO juju.state adding state server info to legacy environment
[LOG] 0:00.116 INFO juju.state found existing state servers []
[LOG] 0:00.134 INFO juju.state initializing environment
[LOG] 0:00.159 INFO juju.state.apiserver listening on "127.0.0.1:55939"
[LOG] 0:00.172 INFO juju.state opening state, mongo addresses: ["localhost:51358"]; entity ""
[LOG] 0:00.173 DEBUG juju.state dialing mongo
[LOG] 0:00.174 INFO juju.state dialled mongo successfully
[LOG] 0:00.175 DEBUG juju.state connection established
[LOG] 0:00.188 INFO juju.conn authorization error while connecting to state server; retrying
[LOG] 0:00.188 INFO juju.state opening state, mongo addresses: ["localhost:51358"]; entity ""
[LOG] 0:00.189 DEBUG juju.state dialing mongo
[LOG] 0:00.190 INFO juju.state dialled mongo successfully
[LOG] 0:00.191 DEBUG juju.state connection established
[LOG] 0:00.195 INFO juju.state adding state server info to legacy environment
[LOG] 0:00.196 INFO juju.state found existing state servers []
[LOG] 0:00.228 INFO juju.state.api dialing "wss://127.0.0.1:55939/"
[LOG] 0:00.230 INFO juju.state.apiserver [38] API connection from 127.0.0.1:34230
[LOG] 0:00.230 INFO juju.state.api connection established to "wss://127.0.0.1:55939/"
[LOG] 0:00.231 DEBUG juju.state.apiserver <- [38] <unknown> {"RequestId":1,"Type":"Admin","Request":"Login","Params":{"AuthTag":"user-admin","Password":"dummy-secret","Nonce":""}}
[LOG] 0:00.231 DEBUG juju.state.apiserver hostPorts: []
[LOG] 0:00.231 DEBUG juju.state.apiserver -> [38] user-admin 427.499us {"RequestId":1,"Response":{"Servers":[]}} Admin[""].Login
[LOG] 0:00.233 DEBUG juju.state.apiserver <- [38] user-admin {"RequestId":3,"Type":"Client","Request":"ServiceDeploy","Params":{"ServiceName":"service-name","CharmUrl":"cs:precise/logging-1","NumUnits":0,"Config":null,"ConfigYAML":"","Constraints":{},"ToMachineSpec":"","IncludeNetworks":null,"ExcludeNetworks":null}}
[LOG] 0:00.268 DEBUG juju.state.apiserver -> [38] user-admin 35.000476ms {"RequestId":3,"Response":{}} Client[""].ServiceDeploy
client_test.go:764:
    c.Assert(charm.Meta(), gc.DeepEquals, bundle.Meta())
... obtained *charm.Meta = &charm.Meta{Name:"logging", Summary:"Subordinate logging test charm", Description:"This is a longer description which\npotentially contains multiple lines.\n", Subordinate:true, Provides:map[string]charm.Relation{"logging-client":charm.Relation{Name:"logging-client", Role:"provider", Interface:"logging", Optional:false, Limit:0, Scope:"global"}}, Requires:map[string]charm.Relation{"logging-directory":charm.Relation{Name:"logging-directory", Role:"requirer", Interface:"logging", Optional:false, Limit:1, Scope:"container"}, "info":charm.Relation{Name:"info", Role:"requirer", Interface:"juju-info", Optional:false, Limit:1, Scope:"container"}}, Peers:map[string]charm.Relation(nil), Format:1, OldRevision:0, Categories:[]string(nil), Series:""}
... expected *charm.Meta = &charm.Meta{Name:"logging", Summary:"Subordinate logging test charm", Description:"This is a longer description which\npotentially contains multiple lines.\n", Subordinate:true, Provides:map[string]charm.Relation{"logging-client":charm.Relation{Name:"logging-client", Role:"provider", Interface:"logging", Optional:false, Limit:0, Scope:"global"}}, Requires:map[string]charm.Relation{"logging-directory":charm.Relation{Name:"logging-directory", Role:"requirer", Interface:"logging", Optional:false, Limit:1, Scope:"container"}, "info":charm.Relation{Name:"info", Role:"requirer", Interface:"juju-info", Optional:false, Limit:1, Scope:"container"}}, Peers:map[string]charm.Relation{}, Format:1, OldRevision:0, Categories:[]string(nil), Series:""}

[LOG] 0:00.286 INFO juju.provider.dummy reset environment
[LOG] 0:00.286 INFO juju.state.apiserver [38] user-admin API connection terminated after 55.859688ms
[LOG] 0:00.289 INFO juju.testing reset successfully reset admin password
[LOG] 0:00.307 INFO juju.testing reset successfully reset admin password
[LOG] 0:00.310 INFO juju.testing reset successfully reset admin password

----------------------------------------------------------------------
FAIL: client_test.go:803: clientSuite.TestClientServiceDeployToMachine

[LOG] 0:00.017 DEBUG juju.environs.configstore Making /tmp/jctest.4DC/gocheck-5577006791947779410/229/home/ubuntu/.juju/environments
[LOG] 0:00.073 INFO juju.environs.testing uploading FAKE tools 1.19.3-precise-amd64
[LOG] 0:00.085 INFO juju.environs.testing uploading FAKE tools 1.19.3-precise-amd64
[LOG] 0:00.086 INFO juju.environs.testing uploading FAKE tools 1.19.3-precise-amd64
[LOG] 0:00.086 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 0:00.086 DEBUG juju.environs.tools no series specified when finding tools, looking for any
[LOG] 0:00.086 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not found
[LOG] 0:00.086 DEBUG juju.environs.simplestreams cannot load index "streams/v1/index.sjson": invalid URL "tools/streams/v1/index.sjson" not found
[LOG] 0:00.086 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/index.json": file "tools/streams/v1/index.json" not found not found
[LOG] 0:00.086 DEBUG juju.environs.simplestreams cannot load index "streams/v1/index.json": invalid URL "tools/streams/v1/index.json" not found
[LOG] 0:00.086 INFO juju.environs.tools Writing tools/streams/v1/index.json
[LOG] 0:00.086 INFO juju.environs.tools Writing tools/streams/v1/com.ubuntu.juju:released:tools.json
[LOG] 0:00.086 DEBUG juju.environs.bootstrap environment "dummyenv" supports service/machine networks: true
[LOG] 0:00.086 INFO juju.environs.bootstrap bootstrapping environment "dummyenv"
[LOG] 0:00.086 DEBUG juju.environs.bootstrap looking for bootstrap tools: series="precise", arch=<nil>, version=1.19.3
[LOG] 0:00.086 INFO juju.environs.tools reading tools with major.minor version 1.19
[LOG] 0:00.086 INFO juju.environs.tools filtering tools by version: 1.19.3
[LOG] 0:00.086 INFO juju.environs.tools filtering tools by series: precise
[LOG] 0:00.086 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 0:00.086 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not found
[LOG] 0:00.087 DEBUG juju.environs.simplestreams cannot load index "streams/v1/index.sjson": invalid URL "tools/streams/v1/index.sjson" not found
[LOG] 0:00.087 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/mirrors.json": file "tools/streams/v1/mirrors.json" not found not found
[LOG] 0:00.087 DEBUG juju.environs.simplestreams no mirror index file found
[LOG] 0:00.087 DEBUG juju.environs.simplestreams no mirror information available for { }: mirror data for "com.ubuntu.juju:released:tools" not found
[LOG] 0:00.087 DEBUG juju.environs.simplestreams read metadata index at "http://127.0.0.1:48940/dummyenv/private/tools/streams/v1/index.json"
[LOG] 0:00.087 DEBUG juju.environs.simplestreams candidate matches for products ["com.ubuntu.juju:12.04:amd64" "com.ubuntu.juju:12.04:i386" "com.ubuntu.juju:12.04:armhf" "com.ubuntu.juju:12.04:arm64" "com.ubuntu.juju:12.04:ppc64"] are [{Mon, 02 Jun 2014 09:22:46 +0000 products:1.0 content-download  [] streams/v1/com.ubuntu.juju:released:tools.json [com.ubuntu.juju:12.04:amd64]}]
[LOG] 0:00.087 DEBUG juju.environs.simplestreams finding products at path "streams/v1/com.ubuntu.juju:released:tools.json"
[LOG] 0:00.087 DEBUG juju.environs.simplestreams metadata: &{map[com.ubuntu.juju:12.04:amd64:{ 1.19.3 amd64   map[20140602:0xc200752ea0]}] map[] Mon, 02 Jun 2014 09:22:46 +0000 products:1.0 com.ubuntu.juju:released:tools}
[LOG] 0:00.087 INFO juju.environs.bootstrap newest version: 1.19.3
[LOG] 0:00.087 INFO juju.environs.bootstrap picked bootstrap tools version: 1.19.3
[LOG] 0:00.087 INFO juju.provider.dummy would pick tools from 1.19.3-precise-amd64
[LOG] 0:00.087 DEBUG juju.environs.bootstrap putting "provider-state" to bootstrap storage *dummy.dummyStorage
[LOG] 0:00.087 INFO juju.state opening state, mongo addresses: ["localhost:51358"]; entity ""
[LOG] 0:00.087 DEBUG juju.state dialing mongo
[LOG] 0:00.089 INFO juju.state dialled mongo successfully
[LOG] 0:00.090 DEBUG juju.state connection established
[LOG] 0:00.108 INFO juju.state adding state server info to legacy environment
[LOG] 0:00.108 INFO juju.state found existing state servers []
[LOG] 0:00.120 INFO juju.state initializing environment
[LOG] 0:00.148 INFO juju.state.apiserver listening on "127.0.0.1:42586"
[LOG] 0:00.162 INFO juju.state opening state, mongo addresses: ["localhost:51358"]; entity ""
[LOG] 0:00.162 DEBUG juju.state dialing mongo
[LOG] 0:00.164 INFO juju.state dialled mongo successfully
[LOG] 0:00.164 DEBUG juju.state connection established
[LOG] 0:00.178 INFO juju.conn authorization error while connecting to state server; retrying
[LOG] 0:00.178 INFO juju.state opening state, mongo addresses: ["localhost:51358"]; entity ""
[LOG] 0:00.178 DEBUG juju.state dialing mongo
[LOG] 0:00.179 INFO juju.state dialled mongo successfully
[LOG] 0:00.180 DEBUG juju.state connection established
[LOG] 0:00.185 INFO juju.state adding state server info to legacy environment
[LOG] 0:00.185 INFO juju.state found existing state servers []
[LOG] 0:00.218 INFO juju.state.api dialing "wss://127.0.0.1:42586/"
[LOG] 0:00.220 INFO juju.state.apiserver [39] API connection from 127.0.0.1:57384
[LOG] 0:00.220 INFO juju.state.api connection established to "wss://127.0.0.1:42586/"
[LOG] 0:00.220 DEBUG juju.state.apiserver <- [39] <unknown> {"RequestId":1,"Type":"Admin","Request":"Login","Params":{"AuthTag":"user-admin","Password":"dummy-secret","Nonce":""}}
[LOG] 0:00.221 DEBUG juju.state.apiserver hostPorts: []
[LOG] 0:00.221 DEBUG juju.state.apiserver -> [39] user-admin 515.726us {"RequestId":1,"Response":{"Servers":[]}} Admin[""].Login
[LOG] 0:00.256 DEBUG juju.state.apiserver <- [39] user-admin {"RequestId":3,"Type":"Client","Request":"ServiceDeploy","Params":{"ServiceName":"service-name","CharmUrl":"cs:precise/dummy-1","NumUnits":1,"Config":null,"ConfigYAML":"service-name:\n  username: fred","Constraints":{},"ToMachineSpec":"0","IncludeNetworks":null,"ExcludeNetworks":null}}
[LOG] 0:00.309 DEBUG juju.state.apiserver -> [39] user-admin 52.885683ms {"RequestId":3,"Response":{}} Client[""].ServiceDeploy
client_test.go:821:
    c.Assert(charm.Meta(), gc.DeepEquals, bundle.Meta())
... obtained *charm.Meta = &charm.Meta{Name:"dummy", Summary:"That's a dummy charm.", Description:"This is a longer description which\npotentially contains multiple lines.\n", Subordinate:false, Provides:map[string]charm.Relation(nil), Requires:map[string]charm.Relation(nil), Peers:map[string]charm.Relation(nil), Format:1, OldRevision:0, Categories:[]string(nil), Series:""}
... expected *charm.Meta = &charm.Meta{Name:"dummy", Summary:"That's a dummy charm.", Description:"This is a longer description which\npotentially contains multiple lines.\n", Subordinate:false, Provides:map[string]charm.Relation{}, Requires:map[string]charm.Relation{}, Peers:map[string]charm.Relation{}, Format:1, OldRevision:0, Categories:[]string(nil), Series:""}

[LOG] 0:00.327 INFO juju.provider.dummy reset environment
[LOG] 0:00.328 INFO juju.state.apiserver [39] user-admin API connection terminated after 107.312983ms
[LOG] 0:00.338 INFO juju.testing reset successfully reset admin password
[LOG] 0:00.343 INFO juju.testing reset successfully reset admin password
[LOG] 0:00.346 INFO juju.testing reset successfully reset admin password

----------------------------------------------------------------------
FAIL: client_test.go:684: clientSuite.TestClientServiceDeployWithNetworks

[LOG] 0:00.016 DEBUG juju.environs.configstore Making /tmp/jctest.4DC/gocheck-5577006791947779410/234/home/ubuntu/.juju/environments
[LOG] 0:00.073 INFO juju.environs.testing uploading FAKE tools 1.19.3-precise-amd64
[LOG] 0:00.085 INFO juju.environs.testing uploading FAKE tools 1.19.3-precise-amd64
[LOG] 0:00.085 INFO juju.environs.testing uploading FAKE tools 1.19.3-precise-amd64
[LOG] 0:00.086 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 0:00.086 DEBUG juju.environs.tools no series specified when finding tools, looking for any
[LOG] 0:00.086 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not found
[LOG] 0:00.086 DEBUG juju.environs.simplestreams cannot load index "streams/v1/index.sjson": invalid URL "tools/streams/v1/index.sjson" not found
[LOG] 0:00.086 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/index.json": file "tools/streams/v1/index.json" not found not found
[LOG] 0:00.086 DEBUG juju.environs.simplestreams cannot load index "streams/v1/index.json": invalid URL "tools/streams/v1/index.json" not found
[LOG] 0:00.086 INFO juju.environs.tools Writing tools/streams/v1/index.json
[LOG] 0:00.086 INFO juju.environs.tools Writing tools/streams/v1/com.ubuntu.juju:released:tools.json
[LOG] 0:00.086 DEBUG juju.environs.bootstrap environment "dummyenv" supports service/machine networks: true
[LOG] 0:00.086 INFO juju.environs.bootstrap bootstrapping environment "dummyenv"
[LOG] 0:00.086 DEBUG juju.environs.bootstrap looking for bootstrap tools: series="precise", arch=<nil>, version=1.19.3
[LOG] 0:00.086 INFO juju.environs.tools reading tools with major.minor version 1.19
[LOG] 0:00.086 INFO juju.environs.tools filtering tools by version: 1.19.3
[LOG] 0:00.086 INFO juju.environs.tools filtering tools by series: precise
[LOG] 0:00.086 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 0:00.086 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not found
[LOG] 0:00.086 DEBUG juju.environs.simplestreams cannot load index "streams/v1/index.sjson": invalid URL "tools/streams/v1/index.sjson" not found
[LOG] 0:00.086 DEBUG juju.environs.simplestreams fetchData failed for "tools/streams/v1/mirrors.json": file "tools/streams/v1/mirrors.json" not found not found
[LOG] 0:00.086 DEBUG juju.environs.simplestreams no mirror index file found
[LOG] 0:00.086 DEBUG juju.environs.simplestreams no mirror information available for { }: mirror data for "com.ubuntu.juju:released:tools" not found
[LOG] 0:00.086 DEBUG juju.environs.simplestreams read metadata index at "http://127.0.0.1:60425/dummyenv/private/tools/streams/v1/index.json"
[LOG] 0:00.086 DEBUG juju.environs.simplestreams candidate matches for products ["com.ubuntu.juju:12.04:amd64" "com.ubuntu.juju:12.04:i386" "com.ubuntu.juju:12.04:armhf" "com.ubuntu.juju:12.04:arm64" "com.ubuntu.juju:12.04:ppc64"] are [{Mon, 02 Jun 2014 09:22:46 +0000 products:1.0 content-download  [] streams/v1/com.ubuntu.juju:released:tools.json [com.ubuntu.juju:12.04:amd64]}]
[LOG] 0:00.086 DEBUG juju.environs.simplestreams finding products at path "streams/v1/com.ubuntu.juju:released:tools.json"
[LOG] 0:00.086 DEBUG juju.environs.simplestreams metadata: &{map[com.ubuntu.juju:12.04:amd64:{ 1.19.3 amd64   map[20140602:0xc200752e40]}] map[] Mon, 02 Jun 2014 09:22:46 +0000 products:1.0 com.ubuntu.juju:released:tools}
[LOG] 0:00.087 INFO juju.environs.bootstrap newest version: 1.19.3
[LOG] 0:00.087 INFO juju.environs.bootstrap picked bootstrap tools version: 1.19.3
[LOG] 0:00.087 INFO juju.provider.dummy would pick tools from 1.19.3-precise-amd64
[LOG] 0:00.087 DEBUG juju.environs.bootstrap putting "provider-state" to bootstrap storage *dummy.dummyStorage
[LOG] 0:00.087 INFO juju.state opening state, mongo addresses: ["localhost:51358"]; entity ""
[LOG] 0:00.087 DEBUG juju.state dialing mongo
[LOG] 0:00.089 INFO juju.state dialled mongo successfully
[LOG] 0:00.089 DEBUG juju.state connection established
[LOG] 0:00.117 INFO juju.state adding state server info to legacy environment
[LOG] 0:00.117 INFO juju.state found existing state servers []
[LOG] 0:00.129 INFO juju.state initializing environment
[LOG] 0:00.155 INFO juju.state.apiserver listening on "127.0.0.1:38697"
[LOG] 0:00.169 INFO juju.state opening state, mongo addresses: ["localhost:51358"]; entity ""
[LOG] 0:00.169 DEBUG juju.state dialing mongo
[LOG] 0:00.170 INFO juju.state dialled mongo successfully
[LOG] 0:00.171 DEBUG juju.state connection established
[LOG] 0:00.183 INFO juju.conn authorization error while connecting to state server; retrying
[LOG] 0:00.183 INFO juju.state opening state, mongo addresses: ["localhost:51358"]; entity ""
[LOG] 0:00.183 DEBUG juju.state dialing mongo
[LOG] 0:00.185 INFO juju.state dialled mongo successfully
[LOG] 0:00.186 DEBUG juju.state connection established
[LOG] 0:00.190 INFO juju.state adding state server info to legacy environment
[LOG] 0:00.190 INFO juju.state found existing state servers []
[LOG] 0:00.223 INFO juju.state.api dialing "wss://127.0.0.1:38697/"
[LOG] 0:00.225 INFO juju.state.apiserver [3A] API connection from 127.0.0.1:60054
[LOG] 0:00.225 INFO juju.state.api connection established to "wss://127.0.0.1:38697/"
[LOG] 0:00.226 DEBUG juju.state.apiserver <- [3A] <unknown> {"RequestId":1,"Type":"Admin","Request":"Login","Params":{"AuthTag":"user-admin","Password":"dummy-secret","Nonce":""}}
[LOG] 0:00.226 DEBUG juju.state.apiserver hostPorts: []
[LOG] 0:00.226 DEBUG juju.state.apiserver -> [3A] user-admin 438.973us {"RequestId":1,"Response":{"Servers":[]}} Admin[""].Login
[LOG] 0:00.237 DEBUG juju.state.apiserver <- [3A] user-admin {"RequestId":3,"Type":"Client","Request":"ServiceDeployWithNetworks","Params":{"ServiceName":"service","CharmUrl":"cs:precise/dummy-1","NumUnits":3,"Config":null,"ConfigYAML":"","Constraints":{"mem":4096},"ToMachineSpec":"","IncludeNetworks":["net1","net2"],"ExcludeNetworks":["net3"]}}
[LOG] 0:00.248 DEBUG juju.state.apiserver -> [3A] user-admin 10.984536ms {"RequestId":3,"Error":"\"net1\" is not a valid network tag","Response":{}} Client[""].ServiceDeployWithNetworks
[LOG] 0:00.248 DEBUG juju.state.apiserver <- [3A] user-admin {"RequestId":4,"Type":"Client","Request":"ServiceDeployWithNetworks","Params":{"ServiceName":"service","CharmUrl":"cs:precise/dummy-1","NumUnits":3,"Config":null,"ConfigYAML":"","Constraints":{"mem":4096},"ToMachineSpec":"","IncludeNetworks":["network-net1","network-net2"],"ExcludeNetworks":["network-net3"]}}
[LOG] 0:00.382 DEBUG juju.state.apiserver -> [3A] user-admin 133.85499ms {"RequestId":4,"Response":{}} Client[""].ServiceDeployWithNetworks
client_test.go:702:
    service := s.assertPrincipalDeployed(c, "service", curl, false, bundle, mem4g)
client_test.go:717:
    c.Assert(charm.Meta(), gc.DeepEquals, bundle.Meta())
... obtained *charm.Meta = &charm.Meta{Name:"dummy", Summary:"That's a dummy charm.", Description:"This is a longer description which\npotentially contains multiple lines.\n", Subordinate:false, Provides:map[string]charm.Relation(nil), Requires:map[string]charm.Relation(nil), Peers:map[string]charm.Relation(nil), Format:1, OldRevision:0, Categories:[]string(nil), Series:""}
... expected *charm.Meta = &charm.Meta{Name:"dummy", Summary:"That's a dummy charm.", Description:"This is a longer description which\npotentially contains multiple lines.\n", Subordinate:false, Provides:map[string]charm.Relation{}, Requires:map[string]charm.Relation{}, Peers:map[string]charm.Relation{}, Format:1, OldRevision:0, Categories:[]string(nil), Series:""}

[LOG] 0:00.403 INFO juju.provider.dummy reset environment
[LOG] 0:00.403 INFO juju.state.apiserver [3A] user-admin API connection terminated after 177.781573ms
[LOG] 0:00.406 INFO juju.testing reset successfully reset admin password
[LOG] 0:00.426 INFO juju.testing reset successfully reset admin password
[LOG] 0:00.428 INFO juju.testing reset successfully reset admin password
OOPS: 117 passed, 5 FAILED
--- FAIL: TestAll (48.61 seconds)
FAIL
FAIL	launchpad.net/juju-core/state/apiserver/client	48.796s
ok  	launchpad.net/juju-core/state/apiserver/common	1.942s
?   	launchpad.net/juju-core/state/apiserver/common/testing	[no test files]
ok  	launchpad.net/juju-core/state/apiserver/deployer	3.825s
ok  	launchpad.net/juju-core/state/apiserver/environment	0.991s
ok  	launchpad.net/juju-core/state/apiserver/firewaller	5.312s
ok  	launchpad.net/juju-core/state/apiserver/keymanager	3.968s
?   	launchpad.net/juju-core/state/apiserver/keymanager/testing	[no test files]
ok  	launchpad.net/juju-core/state/apiserver/keyupdater	2.260s
ok  	launchpad.net/juju-core/state/apiserver/logger	2.894s
ok  	launchpad.net/juju-core/state/apiserver/machine	2.340s
ok  	launchpad.net/juju-core/state/apiserver/provisioner	18.006s
ok  	launchpad.net/juju-core/state/apiserver/rsyslog	2.718s
?   	launchpad.net/juju-core/state/apiserver/testing	[no test files]
ok  	launchpad.net/juju-core/state/apiserver/uniter	17.805s
ok  	launchpad.net/juju-core/state/apiserver/upgrader	10.543s
ok  	launchpad.net/juju-core/state/apiserver/usermanager	1.378s
ok  	launchpad.net/juju-core/state/multiwatcher	0.710s
ok  	launchpad.net/juju-core/state/presence	5.657s
ok  	launchpad.net/juju-core/state/storage	0.373s
?   	launchpad.net/juju-core/state/testing	[no test files]
ok  	launchpad.net/juju-core/state/watcher	4.606s
ok  	launchpad.net/juju-core/store	14.492s
ok  	launchpad.net/juju-core/testing	0.371s
ok  	launchpad.net/juju-core/testing/filetesting	0.099s
ok  	launchpad.net/juju-core/testing/testbase	0.013s
ok  	launchpad.net/juju-core/tools	0.013s
ok  	launchpad.net/juju-core/upgrades	6.572s
ok  	launchpad.net/juju-core/upstart	0.993s
ok  	launchpad.net/juju-core/utils	1.925s
ok  	launchpad.net/juju-core/utils/apt	0.027s
ok  	launchpad.net/juju-core/utils/exec	0.027s
ok  	launchpad.net/juju-core/utils/fslock	0.974s
ok  	launchpad.net/juju-core/utils/parallel	0.728s
ok  	launchpad.net/juju-core/utils/proxy	0.021s
ok  	launchpad.net/juju-core/utils/registry	0.016s
ok  	launchpad.net/juju-core/utils/set	0.015s
ok  	launchpad.net/juju-core/utils/shell	0.040s
ok  	launchpad.net/juju-core/utils/ssh	0.673s
?   	launchpad.net/juju-core/utils/ssh/testing	[no test files]
ok  	launchpad.net/juju-core/utils/syslog	0.038s
?   	launchpad.net/juju-core/utils/syslog/testing	[no test files]
ok  	launchpad.net/juju-core/utils/tailer	1.008s
ok  	launchpad.net/juju-core/utils/voyeur	0.017s
ok  	launchpad.net/juju-core/utils/zip	0.128s
ok  	launchpad.net/juju-core/version	0.235s
ok  	launchpad.net/juju-core/version/ubuntu	0.190s
ok  	launchpad.net/juju-core/worker	16.569s
ok  	launchpad.net/juju-core/worker/apiaddressupdater	1.278s
ok  	launchpad.net/juju-core/worker/authenticationworker	2.702s
ok  	launchpad.net/juju-core/worker/charmrevisionworker	1.721s
ok  	launchpad.net/juju-core/worker/cleaner	0.698s
ok  	launchpad.net/juju-core/worker/deployer	7.751s
ok  	launchpad.net/juju-core/worker/firewaller	8.250s
ok  	launchpad.net/juju-core/worker/instancepoller	1.572s
ok  	launchpad.net/juju-core/worker/localstorage	0.039s
ok  	launchpad.net/juju-core/worker/logger	0.842s
ok  	launchpad.net/juju-core/worker/machineenvironmentworker	6.904s
ok  	launchpad.net/juju-core/worker/machiner	2.376s
ok  	launchpad.net/juju-core/worker/minunitsworker	0.695s
ok  	launchpad.net/juju-core/worker/peergrouper	1.008s
ok  	launchpad.net/juju-core/worker/provisioner	51.801s
ok  	launchpad.net/juju-core/worker/resumer	0.920s
ok  	launchpad.net/juju-core/worker/rsyslog	3.102s
ok  	launchpad.net/juju-core/worker/singular	0.306s
ok  	launchpad.net/juju-core/worker/terminationworker	0.198s
ok  	launchpad.net/juju-core/worker/uniter	127.504s
ok  	launchpad.net/juju-core/worker/uniter/charm	2.369s
ok  	launchpad.net/juju-core/worker/uniter/debug	1.232s
ok  	launchpad.net/juju-core/worker/uniter/hook	0.015s
ok  	launchpad.net/juju-core/worker/uniter/jujuc	0.444s
ok  	launchpad.net/juju-core/worker/uniter/relation	1.276s
ok  	launchpad.net/juju-core/worker/upgrader	3.686s

warning: building out-of-date packages:
	launchpad.net/goamz/ec2/ec2test
	launchpad.net/goamz/s3/s3test
	github.com/joyent/gomanta/localservices/hook
	github.com/joyent/gomanta/localservices
	github.com/joyent/gomanta/localservices/manta
	github.com/joyent/gosdc/localservices/hook
	github.com/joyent/gosdc/localservices
	github.com/joyent/gosdc/localservices/cloudapi
	launchpad.net/goose/testservices/hook
	launchpad.net/goose/testservices/identityservice
	launchpad.net/goose/testservices
	launchpad.net/goose/testservices/novaservice
	launchpad.net/goose/testservices/swiftservice
	launchpad.net/goose/testservices/openstackservice
installing these packages with 'go test -i ./...' will speed future tests.

mongod: no process found

Revision history for this message

John A Meinel (jameinel) wrote on 2014-06-02:

So these appear to be genuine test discrepancies. At the least places that expected an empty map seem to have a nil map. I'm not 100% sure what the best fix is, possibly just fix up the tests to expect something different.

Revision history for this message

Horacio Durán (hduran-8) wrote on 2014-06-02:

On 2014/06/02 09:11:54, fwereade wrote:
> LGTM, I'm approving this despite the unnecessary lines in the test. A
followup
> that just dropped those would be very much appreciated.

> https://codereview.appspot.com/101810046/diff/20001/charm/meta_test.go
> File charm/meta_test.go (right):

https://codereview.appspot.com/101810046/diff/20001/charm/meta_test.go#newcode407
> charm/meta_test.go:407: empty_input.Requires = nil
> Aren't these nil already?

LGTM Altough for the records I would appreciate a more detailed
description for the
merge proposal.

https://codereview.appspot.com/101810046/

Unmerged revisions

2717. By Jimmie Butler on 2014-05-29: Change test to pass with omitempty for relations.
2716. By Jimmie Butler on 2014-05-29: Merge in most recent master
2715. By Jimmie Butler on 2014-05-29: Remove serialization change
2714. By Jimmie Butler on 2014-05-28: Merge in most recent master
2713. By Jimmie Butler on 2014-05-28: Go fmt.
2712. By Jimmie Butler on 2014-05-28: Change test order, put error check first.
2711. By Jimmie Butler on 2014-05-28: Change test order to check error first.
2710. By Jimmie Butler on 2014-05-28: Merge with most recent master.
2709. By Jimmie Butler on 2014-05-26: Merge in most recent master
2708. By Jimmie Butler on 2014-05-21: Remove unneeded statement in parseRelation.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Aaron Bentley

Dave Cheney

Dimiter Naydenov

Eric Snow

Jimmie Butler

John A Meinel

Martin Packman

Nate Finch

Raphaël Badin

Tim Penhey

to status/vote changes:

rowez

1	=== modified file 'charm/meta.go'
2	--- charm/meta.go 2014-04-09 16:36:12 +0000
3	+++ charm/meta.go 2014-05-29 01:51:08 +0000
4	@@ -262,10 +262,10 @@
5	}
6
7	func parseRelations(relations interface{}, role RelationRole) map[string]Relation {
8	+ result := make(map[string]Relation)
9	if relations == nil {
10	- return nil
11	+ return result
12	}
13	- result := make(map[string]Relation)
14	for name, rel := range relations.(map[string]interface{}) {
15	relMap := rel.(map[string]interface{})
16	relation := Relation{
17
18	=== modified file 'charm/meta_test.go'
19	--- charm/meta_test.go 2014-04-09 16:36:12 +0000
20	+++ charm/meta_test.go 2014-05-29 01:51:08 +0000
21	@@ -93,8 +93,8 @@
22	Interface: "mysql",
23	Scope: charm.ScopeGlobal,
24	})
25	- c.Assert(meta.Requires, gc.IsNil)
26	- c.Assert(meta.Peers, gc.IsNil)
27	+ c.Assert(meta.Requires, gc.DeepEquals, map[string]charm.Relation{})
28	+ c.Assert(meta.Peers, gc.DeepEquals, map[string]charm.Relation{})
29
30	meta, err = charm.ReadMeta(repoMeta("riak"))
31	c.Assert(err, gc.IsNil)
32	@@ -117,7 +117,7 @@
33	Limit: 1,
34	Scope: charm.ScopeGlobal,
35	})
36	- c.Assert(meta.Requires, gc.IsNil)
37	+ c.Assert(meta.Requires, gc.DeepEquals, map[string]charm.Relation{})
38
39	meta, err = charm.ReadMeta(repoMeta("terracotta"))
40	c.Assert(err, gc.IsNil)
41	@@ -135,7 +135,7 @@
42	Limit: 1,
43	Scope: charm.ScopeGlobal,
44	})
45	- c.Assert(meta.Requires, gc.IsNil)
46	+ c.Assert(meta.Requires, gc.DeepEquals, map[string]charm.Relation{})
47
48	meta, err = charm.ReadMeta(repoMeta("wordpress"))
49	c.Assert(err, gc.IsNil)
50	@@ -160,7 +160,13 @@
51	Optional: true,
52	Scope: charm.ScopeGlobal,
53	})
54	- c.Assert(meta.Peers, gc.IsNil)
55	+ c.Assert(meta.Peers, gc.DeepEquals, map[string]charm.Relation{})
56	+
57	+ meta, err = charm.ReadMeta(repoMeta("empty-fields"))
58	+ c.Assert(err, gc.IsNil)
59	+ c.Assert(meta.Provides, gc.DeepEquals, map[string]charm.Relation{})
60	+ c.Assert(meta.Requires, gc.DeepEquals, map[string]charm.Relation{})
61	+ c.Assert(meta.Peers, gc.DeepEquals, map[string]charm.Relation{})
62	}
63
64	var relationsConstraintsTests = []struct {
65	@@ -396,12 +402,15 @@
66	for i, codec := range codecs {
67	c.Logf("codec %d", i)
68	empty_input := charm.Meta{}
69	+ empty_input.Provides = nil
70	+ empty_input.Peers = nil
71	+ empty_input.Requires = nil
72	data, err := codec.Marshal(empty_input)
73	c.Assert(err, gc.IsNil)
74	var empty_output charm.Meta
75	err = codec.Unmarshal(data, &empty_output)
76	c.Assert(err, gc.IsNil)
77	- c.Assert(empty_input, gc.DeepEquals, empty_output)
78	+ c.Assert(empty_output, gc.DeepEquals, empty_input)
79	}
80	}
81
82
83	=== modified file 'schema/schema.go'
84	--- schema/schema.go 2014-01-15 10:50:11 +0000
85	+++ schema/schema.go 2014-05-29 01:51:08 +0000
86	@@ -293,6 +293,11 @@
87
88	func (c mapC) Coerce(v interface{}, path []string) (interface{}, error) {
89	rv := reflect.ValueOf(v)
90	+
91	+ // treat nil value as empty map
92	+ if rv.Kind() == reflect.Invalid {
93	+ return make(map[interface{}]interface{}), nil
94	+ }
95	if rv.Kind() != reflect.Map {
96	return nil, error_{"map", v, path}
97	}
98	@@ -334,6 +339,11 @@
99
100	func (c stringMapC) Coerce(v interface{}, path []string) (interface{}, error) {
101	rv := reflect.ValueOf(v)
102	+
103	+ // treat nil value as empty map
104	+ if rv.Kind() == reflect.Invalid {
105	+ return make(map[string]interface{}), nil
106	+ }
107	if rv.Kind() != reflect.Map {
108	return nil, error_{"map", v, path}
109	}
110	@@ -399,6 +409,11 @@
111
112	func (c fieldMapC) Coerce(v interface{}, path []string) (interface{}, error) {
113	rv := reflect.ValueOf(v)
114	+
115	+ // treat nil value as empty map
116	+ if rv.Kind() == reflect.Invalid {
117	+ return make(map[string]interface{}), nil
118	+ }
119	if rv.Kind() != reflect.Map {
120	return nil, error_{"map", v, path}
121	}
122	@@ -488,6 +503,11 @@
123
124	func (c mapSetC) Coerce(v interface{}, path []string) (interface{}, error) {
125	rv := reflect.ValueOf(v)
126	+
127	+ // treat nil value as empty map
128	+ if rv.Kind() == reflect.Invalid {
129	+ return make(map[string]interface{}), nil
130	+ }
131	if rv.Kind() != reflect.Map {
132	return nil, error_{"map", v, path}
133	}
134
135	=== modified file 'schema/schema_test.go'
136	--- schema/schema_test.go 2014-01-14 13:10:26 +0000
137	+++ schema/schema_test.go 2014-05-29 01:51:08 +0000
138	@@ -250,8 +250,8 @@
139	c.Assert(err, gc.ErrorMatches, "<path>: expected map, got int\\(42\\)")
140
141	out, err = sch.Coerce(nil, aPath)
142	- c.Assert(out, gc.IsNil)
143	- c.Assert(err, gc.ErrorMatches, "<path>: expected map, got nothing")
144	+ c.Assert(err, gc.IsNil)
145	+ c.Assert(out, gc.DeepEquals, map[interface{}]interface{}{})
146
147	out, err = sch.Coerce(map[int]int{1: 1}, aPath)
148	c.Assert(out, gc.IsNil)
149	@@ -274,12 +274,12 @@
150	c.Assert(out, gc.DeepEquals, map[string]interface{}{"a": int64(1), "b": int64(2)})
151
152	out, err = sch.Coerce(42, aPath)
153	- c.Assert(out, gc.IsNil)
154	c.Assert(err, gc.ErrorMatches, "<path>: expected map, got int\\(42\\)")
155	+ c.Assert(out, gc.IsNil)
156
157	out, err = sch.Coerce(nil, aPath)
158	- c.Assert(out, gc.IsNil)
159	- c.Assert(err, gc.ErrorMatches, "<path>: expected map, got nothing")
160	+ c.Assert(err, gc.IsNil)
161	+ c.Assert(out, gc.DeepEquals, map[string]interface{}{})
162
163	out, err = sch.Coerce(map[int]int{1: 1}, aPath)
164	c.Assert(out, gc.IsNil)
165	@@ -306,8 +306,8 @@
166	c.Assert(err, gc.ErrorMatches, "<path>: expected map, got int\\(42\\)")
167
168	out, err = sch.Coerce(nil, aPath)
169	- c.Assert(out, gc.IsNil)
170	- c.Assert(err, gc.ErrorMatches, "<path>: expected map, got nothing")
171	+ c.Assert(err, gc.IsNil)
172	+ c.Assert(out, gc.DeepEquals, map[string]interface{}{})
173
174	out, err = sch.Coerce(map[string]interface{}{"a": "A", "b": "C"}, aPath)
175	c.Assert(out, gc.IsNil)
176	@@ -416,8 +416,8 @@
177	c.Assert(err, gc.ErrorMatches, `<path>: expected map, got int\(42\)`)
178
179	out, err = sch.Coerce(nil, aPath)
180	- c.Assert(out, gc.IsNil)
181	- c.Assert(err, gc.ErrorMatches, `<path>: expected map, got nothing`)
182	+ c.Assert(err, gc.IsNil)
183	+ c.Assert(out, gc.DeepEquals, map[string]interface{}{})
184
185	// First path entry shouldn't have dots in an error message.
186	out, err = sch.Coerce(map[string]int{"a": 1}, nil)
187
188	=== added directory 'testing/repo/quantal/empty-fields'
189	=== added file 'testing/repo/quantal/empty-fields/metadata.yaml'
190	--- testing/repo/quantal/empty-fields/metadata.yaml 1970-01-01 00:00:00 +0000
191	+++ testing/repo/quantal/empty-fields/metadata.yaml 2014-05-29 01:51:08 +0000
192	@@ -0,0 +1,6 @@
193	+name: empty-fields
194	+summary: "Kerosene powered blender"
195	+description: "Description here"
196	+provides:
197	+peers:
198	+requires: