Add a composed base class for commands.

cmd/jujud/main_test.go

 package main
 
 import (
         "errors"
         "flag"
         "fmt"
         "io/ioutil"
         "launchpad.net/gnuflag"
         . "launchpad.net/gocheck"
         "launchpad.net/juju-core/cmd"
@@ skipping 58 matching lines @@
         checkMessage(c, msgf, "--cheese", "cavitate")
 
         cmds := []string{"bootstrap-state", "unit", "machine"}
         for _, cmd := range cmds {
                 checkMessage(c, msgf, cmd, "--cheese")
         }
 
         msga := `unrecognized args: ["toastie"]`
         checkMessage(c, msga,
                 "bootstrap-state",
-                "--instance-id", "ii",
                 "--env-config", b64yaml{"blah": "blah"}.encode(),
                 "toastie")
         checkMessage(c, msga, "unit",
                 "--unit-name", "un/0",
                 "toastie")
         checkMessage(c, msga, "machine",
                 "--machine-id", "42",
                 "toastie")
 }
 
@@ skipping 127 matching lines @@
         output := run(c, "", "bill", 1, "remote")
         c.Assert(output, Equals, "error: JUJU_AGENT_SOCKET not set\n")
 }
 
 func (s *JujuCMainSuite) TestBadSockPath(c *C) {
         badSock := filepath.Join(c.MkDir(), "bad.sock")
         output := run(c, badSock, "bill", 1, "remote")
         err := fmt.Sprintf("error: dial unix %s: .*\n", badSock)
         c.Assert(output, Matches, err)
 }