Always show cmd errors/warnings

cmd/juju/main_test.go

 // Copyright 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package main
 
 import (
         "bytes"
         "flag"
         "fmt"
         "io/ioutil"
         "os"
         "os/exec"
         "path/filepath"
         "strings"
         stdtesting "testing"
 
         "launchpad.net/gnuflag"
         gc "launchpad.net/gocheck"
         "launchpad.net/loggo"
 
         "launchpad.net/juju-core/cmd"
         "launchpad.net/juju-core/environs/config"
         "launchpad.net/juju-core/juju/osenv"
         _ "launchpad.net/juju-core/provider/dummy"
         "launchpad.net/juju-core/testing"
+        jc "launchpad.net/juju-core/testing/checkers"
         "launchpad.net/juju-core/version"
 )
 
 func TestPackage(t *stdtesting.T) {
         testing.MgoTestPackage(t)
 }
 
 type MainSuite struct{}
 
 var _ = gc.Suite(&MainSuite{})
@@ skipping 73 matching lines @@
                 out:     strings.TrimLeft(helpBasics, "\n"),
         }, {
                 summary: "juju help basics is the same as juju",
                 args:    []string{"help", "basics"},
                 code:    0,
                 out:     strings.TrimLeft(helpBasics, "\n"),
         }, {
                 summary: "juju help foo doesn't exist",
                 args:    []string{"help", "foo"},
                 code:    1,
-                out:     "error: unknown command or topic for foo\n",
+                out:     "ERROR unknown command or topic for foo\n",
         }, {
                 summary: "juju help deploy shows the default help without global options",
                 args:    []string{"help", "deploy"},
                 code:    0,
                 out:     deployHelpText(),
         }, {
                 summary: "juju --help deploy shows the same help as 'help deploy'",
                 args:    []string{"--help", "deploy"},
                 code:    0,
                 out:     deployHelpText(),
         }, {
                 summary: "juju deploy --help shows the same help as 'help deploy'",
                 args:    []string{"deploy", "--help"},
                 code:    0,
                 out:     deployHelpText(),
         }, {
                 summary: "unknown command",
                 args:    []string{"discombobulate"},
                 code:    1,
-                out:     "error: unrecognized command: juju discombobulate\n",
+                out:     "ERROR unrecognized command: juju discombobulate\n",
         }, {
                 summary: "unknown option before command",
                 args:    []string{"--cheese", "bootstrap"},
                 code:    2,
                 out:     "error: flag provided but not defined: --cheese\n",
         }, {
                 summary: "unknown option after command",
                 args:    []string{"bootstrap", "--cheese"},
                 code:    2,
                 out:     "error: flag provided but not defined: --cheese\n",
@@ skipping 36 matching lines @@
         c.Assert(err, gc.IsNil)
         return fmt.Sprintf("environment configuration has no admin-secret")
 }
 
 func (s *MainSuite) TestActualRunJujuArgsBeforeCommand(c *gc.C) {
         defer testing.MakeFakeHomeNoEnvironments(c, "one").Restore()
         // Check global args work when specified before command
         msg := breakJuju(c, "Bootstrap")
         logpath := filepath.Join(c.MkDir(), "log")
         out := badrun(c, 1, "--log-file", logpath, "bootstrap")
-        c.Assert(out, gc.Equals, "error: "+msg+"\n")
+        c.Assert(out, jc.HasSuffix, "ERROR "+msg+"\n")
         content, err := ioutil.ReadFile(logpath)
         c.Assert(err, gc.IsNil)
-        fullmsg := fmt.Sprintf(`(.|\n)*ERROR .* command failed: %s\n`, msg)
+        fullmsg := fmt.Sprintf(`(.|\n)*ERROR .* %s\n`, msg)
         c.Assert(string(content), gc.Matches, fullmsg)
 }
 
 func (s *MainSuite) TestActualRunJujuArgsAfterCommand(c *gc.C) {
         defer testing.MakeFakeHomeNoEnvironments(c, "one").Restore()
         // Check global args work when specified after command
         msg := breakJuju(c, "Bootstrap")
         logpath := filepath.Join(c.MkDir(), "log")
         out := badrun(c, 1, "bootstrap", "--log-file", logpath)
-        c.Assert(out, gc.Equals, "error: "+msg+"\n")
+        c.Assert(out, jc.HasSuffix, "ERROR "+msg+"\n")
         content, err := ioutil.ReadFile(logpath)
         c.Assert(err, gc.IsNil)
-        fullmsg := fmt.Sprintf(`(.|\n)*ERROR .* command failed: %s\n`, msg)
+        fullmsg := fmt.Sprintf(`(.|\n)*ERROR .* %s\n`, msg)
         c.Assert(string(content), gc.Matches, fullmsg)
 }
 
 var commandNames = []string{
         "add-machine",
         "add-relation",
         "add-unit",
         "api-endpoints",
         "bootstrap",
         "debug-hooks",
@@ skipping 110 matching lines @@
                 if len(f) == 0 || line[0] != '-' {
                         continue
                 }
                 flags = append(flags, line)
         }
         c.Assert(len(flags), gc.Equals, len(globalFlags))
         for i, line := range flags {
                 c.Assert(line, gc.Matches, globalFlags[i])
         }
 }