← Back to branch summary

~dstroppa/juju-core/joyent-provider-storage

« back to all changes in this revision

Viewing changes to cmd/jujud/agent_test.go

  • Committer: Daniele Stroppa
  • Date: 2014-01-08 15:58:10 UTC
  • mfrom: (1953.1.231 juju-core)
  • Revision ID: daniele.stroppa@joyent.com-20140108155810-xecbwrqkb5i0fyoe
Merging trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmd/jujud/agent_test.go
239
239
                        },
240
240
                        StateServerCert: []byte(coretesting.ServerCert),
241
241
                        StateServerKey:  []byte(coretesting.ServerKey),
242
 
                        StatePort:       coretesting.MgoPort,
 
242
                        StatePort:       coretesting.MgoServer.Port(),
243
243
                        APIPort:         port,
244
244
                })
245
245
        c.Assert(conf.Write(), gc.IsNil)
255
255
}
256
256
 
257
257
func (s *agentSuite) proposeVersion(c *gc.C, vers version.Number) {
258
 
        cfg, err := s.State.EnvironConfig()
 
258
        oldcfg, err := s.State.EnvironConfig()
259
259
        c.Assert(err, gc.IsNil)
260
 
        cfg, err = cfg.Apply(map[string]interface{}{
 
260
        cfg, err := oldcfg.Apply(map[string]interface{}{
261
261
                "agent-version": vers.String(),
262
262
        })
263
263
        c.Assert(err, gc.IsNil)
264
 
        err = s.State.SetEnvironConfig(cfg)
 
264
        err = s.State.SetEnvironConfig(cfg, oldcfg)
265
265
        c.Assert(err, gc.IsNil)
266
266
}
267
267