environs/dummy: enhance start/stop operations

cmd/juju/cmd_test.go

 package main
 
 import (
         "io/ioutil"
         "launchpad.net/gnuflag"
         . "launchpad.net/gocheck"
-        "launchpad.net/juju-core/juju/cmd"
-        "launchpad.net/juju-core/juju/environs"
-        "launchpad.net/juju-core/juju/environs/dummy"
-        "launchpad.net/juju-core/juju/testing"
+        "launchpad.net/juju-core/cmd"
+        "launchpad.net/juju-core/environs"
+        "launchpad.net/juju-core/environs/dummy"
+        "launchpad.net/juju-core/testing"
         "os"
         "path/filepath"
         "reflect"
 )
 
 type cmdSuite struct {
         testing.LoggingSuite
         home string
 }
 
@@ skipping 109 matching lines @@
                         errc <- err
                         return
                 }
 
                 err = com.Run(cmd.DefaultContext())
                 errc <- err
         }()
         return
 }
 
-func checkOp(c *C, op dummy.Operation, kind dummy.OperationKind, env string) {
-        c.Check(op.Kind(), Equals, kind)
-        c.Check(op.Env(), Equals, env)
-}
-
 func (*cmdSuite) TestBootstrapCommand(c *C) {
         // normal bootstrap
         opc, errc := runCommand(new(BootstrapCommand))
-        checkOp(c, <-opc, dummy.OpBootstrap, "peckham")
+        c.Check((<-opc).(dummy.OpBootstrap).Env, Equals, "peckham")
         c.Check(<-errc, IsNil)
 
         // bootstrap with tool uploading - checking that a file
         // is uploaded should be sufficient, as the detailed semantics
         // of UploadTools are tested in environs.
         opc, errc = runCommand(new(BootstrapCommand), "--upload-tools")
-        checkOp(c, <-opc, dummy.OpPutFile, "peckham")
-        checkOp(c, <-opc, dummy.OpBootstrap, "peckham")
+        c.Check((<-opc).(dummy.OpPutFile).Env, Equals, "peckham")
+        c.Check((<-opc).(dummy.OpBootstrap).Env, Equals, "peckham")
         c.Check(<-errc, IsNil)
 
         envs, err := environs.ReadEnvirons("")
         c.Assert(err, IsNil)
         env, err := envs.Open("peckham")
         c.Assert(err, IsNil)
         dir := c.MkDir()
         err = environs.GetTools(env, dir)
         c.Assert(err, IsNil)
 
         // bootstrap with broken environment
         opc, errc = runCommand(new(BootstrapCommand), "-e", "barking")
         c.Check(<-opc, IsNil)
         c.Check(<-errc, ErrorMatches, `broken environment`)
 }
 
 func (*cmdSuite) TestDestroyCommand(c *C) {
         // normal destroy
         opc, errc := runCommand(new(DestroyCommand))
-        checkOp(c, <-opc, dummy.OpDestroy, "peckham")
+        c.Check((<-opc).(dummy.OpDestroy).Env, Equals, "peckham")
         c.Check(<-errc, IsNil)
 
         // destroy with broken environment
         opc, errc = runCommand(new(DestroyCommand), "-e", "barking")
         c.Check(<-opc, IsNil)
         c.Check(<-errc, ErrorMatches, `broken environment`)
 }
 
 var deployTests = []struct {
         args []string
@@ skipping 57 matching lines @@
         // missing args
         _, err := initDeployCommand()
         c.Assert(err, ErrorMatches, "no charm specified")
 
         // bad unit count
         _, err = initDeployCommand("charm-name", "--num-units", "0")
         c.Assert(err, ErrorMatches, "must deploy at least one unit")
 
         // environment tested elsewhere
 }