environs: use new tool-finding funcs

environs/maas/environ_test.go

 package maas
 
 import (
         "encoding/base64"
         . "launchpad.net/gocheck"
         "launchpad.net/gomaasapi"
         "launchpad.net/goyaml"
         "launchpad.net/juju-core/constraints"
         "launchpad.net/juju-core/environs"
         "launchpad.net/juju-core/environs/config"
@@ skipping 243 matching lines @@
         c.Assert(found, Equals, true)
         userData := nodeRequestValues[0].Get("user_data")
         decodedUserData, err := decodeUserData(userData)
         c.Assert(err, IsNil)
         info := machineInfo{string(instance.Id()), "host1"}
         cloudinitRunCmd, err := info.cloudinitRunCmd()
         c.Assert(err, IsNil)
         data, err := goyaml.Marshal(cloudinitRunCmd)
         c.Assert(err, IsNil)
         c.Check(string(decodedUserData), Matches, "(.|\n)*"+string(data)+"(\n|.)*")
+
+        // Trash the tools and try to start another instance.
+        envtesting.RemoveTools(c, env.Storage())
+        instance, err = env.StartInstance("2", "xxxxx", series, constraints.Value{}, stateInfo, apiInfo)

[dimitern, 2013/04/15 17:27:23]

s/xxxxx/fake_nonce/

[fwereade, 2013/04/16 07:39:13]

Done.

+        c.Check(instance, IsNil)
+        c.Check(err, ErrorMatches, "no tools available")
+        c.Check(err, FitsTypeOf, (*environs.NotFoundError)(nil))

[dimitern, 2013/04/15 17:27:23]

shouldn't this be c.Check(environs.IsNotFound(err), Equals, true) instead?

[fwereade, 2013/04/16 07:39:13]

Don't think we have one of those. Pondered tweaking it, decided I had bigger
fish to fry.

 }
 
 func (suite *EnvironSuite) getInstance(systemId string) *maasInstance {
         input := `{"system_id": "` + systemId + `"}`
         node := suite.testMAASObject.TestServer.NewNode(input)
         return &maasInstance{&node, suite.environ}
 }
 
 func (suite *EnvironSuite) TestStopInstancesReturnsIfParameterEmpty(c *C) {
         suite.getInstance("test1")
@@ skipping 63 matching lines @@
         c.Check(listing, DeepEquals, []string{})
 }
 
 // It would be nice if we could unit-test Bootstrap() in more detail, but
 // at the time of writing that would require more support from gomaasapi's
 // testing service than we have.
 func (suite *EnvironSuite) TestBootstrapSucceeds(c *C) {
         suite.setupFakeTools(c)
         env := suite.makeEnviron()
         suite.testMAASObject.TestServer.NewNode(`{"system_id": "thenode", "hostname": "host"}`)
-        cert := []byte{1, 2, 3}
-        key := []byte{4, 5, 6}
+        err := env.Bootstrap(constraints.Value{})
+        c.Assert(err, IsNil)
+}
 
-        err := env.Bootstrap(constraints.Value{}, cert, key)
-        c.Assert(err, IsNil)
+func (suite *EnvironSuite) TestBootstrapFailsIfNoTools(c *C) {
+        suite.setupFakeTools(c)
+        env := suite.makeEnviron()
+        // Can't RemoveAllTools, no public storage.
+        envtesting.RemoveTools(c, env.Storage())
+        err := env.Bootstrap(constraints.Value{})
+        c.Check(err, ErrorMatches, "no tools available")
+        c.Check(err, FitsTypeOf, (*environs.NotFoundError)(nil))

[dimitern, 2013/04/15 17:27:23]

ditto

 }
 
 func (suite *EnvironSuite) TestBootstrapFailsIfNoNodes(c *C) {
         suite.setupFakeTools(c)
         env := suite.makeEnviron()
-        cert := []byte{1, 2, 3}
-        key := []byte{4, 5, 6}
-        err := env.Bootstrap(constraints.Value{}, cert, key)
+        err := env.Bootstrap(constraints.Value{})
         // Since there are no nodes, the attempt to allocate one returns a
         // 409: Conflict.
         c.Check(err, ErrorMatches, ".*409.*")
 }
 
 func (suite *EnvironSuite) TestBootstrapIntegratesWithEnvirons(c *C) {
         suite.setupFakeTools(c)
         env := suite.makeEnviron()
         suite.testMAASObject.TestServer.NewNode(`{"system_id": "bootstrapnode", "hostname": "host"}`)
 
         // environs.Bootstrap calls Environ.Bootstrap.  This works.
         err := environs.Bootstrap(env, constraints.Value{})
         c.Assert(err, IsNil)
 }
 
 func (suite *EnvironSuite) TestAssignmentPolicy(c *C) {
         env := suite.makeEnviron()
 
         c.Check(env.AssignmentPolicy(), Equals, state.AssignUnused)
 }