Merge lp:~dave-cheney/juju-core/072-cmd-jujud-test-cleanup into lp:~juju/juju-core/trunk

[Dave Cheney]

cmd/jujud: simplify tests

Resolving a comment from the prereq.

https://codereview.appspot.com/7132056/

[William Reade (fwereade)]

LGTM

https://codereview.appspot.com/7132056/

[Roger Peppe (rogpeppe)]

LGTM

https://codereview.appspot.com/7132056/

Unmerged revisions

853. By Dave Cheney on 2013-01-18

cleanup from previous CL

852. By Dave Cheney on 2013-01-18

 merge conflict, nothing to see here

851. By Dave Cheney on 2013-01-18

merge from trunk and respond to review feedback

850. By Dave Cheney on 2013-01-18

stater tests

849. By Dave Cheney on 2013-01-17

fix tests

848. By Dave Cheney on 2013-01-17

merge from prereq

847. By Dave Cheney on 2013-01-17

remove double dd

846. By Dave Cheney on 2013-01-17

merge from prereq

845. By Dave Cheney on 2013-01-17

wip

844. By Dave Cheney on 2013-01-17

wip

=== modified file 'cmd/jujud/main_test.go'
--- cmd/jujud/main_test.go	2013-01-11 12:00:47 +0000
+++ cmd/jujud/main_test.go	2013-01-18 20:33:21 +0000
@@ -1,9 +1,11 @@
 package main
 
 import (
+	"bytes"
 	"flag"
 	"io/ioutil"
 	. "launchpad.net/gocheck"
+	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/testing"
 	"os"
 	"os/exec"
@@ -55,6 +57,15 @@
 	c.Assert(lines[len(lines)-2], Equals, "error: "+msg)
 }
 
+func runMain(c cmd.Command, args ...string) (*bytes.Buffer, *bytes.Buffer, int) {
+	var stdout, stderr bytes.Buffer
+	ctx := &cmd.Context{
+		Stdout: &stdout,
+		Stderr: &stderr,
+	}
+	return &stdout, &stderr, cmd.Main(c, ctx, args)
+}
+
 func (s *MainSuite) TestParseErrors(c *C) {
 	// Check all the obvious parse errors
 	checkMessage(c, "no command specified")

=== modified file 'cmd/jujud/stater_test.go'
--- cmd/jujud/stater_test.go	2013-01-18 20:33:21 +0000
+++ cmd/jujud/stater_test.go	2013-01-18 20:33:21 +0000
@@ -6,9 +6,7 @@
 	"os"
 	"path/filepath"
 
-	"bytes"
 	. "launchpad.net/gocheck"
-	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/worker/stater"
 )
 
@@ -61,12 +59,7 @@
 }
 
 func (s *StaterSuite) TestStater(c *C) {
-	var stdout, stderr bytes.Buffer
-	ctx := &cmd.Context{
-		Stdout: &stdout,
-		Stderr: &stderr,
-	}
-	code := cmd.Main(&StaterCommand{Config: s.config}, ctx, nil)
+	stdout, stderr, code := runMain(&StaterCommand{Config: s.config})
 	c.Check(code, Equals, 0)
 	c.Assert(stderr.String(), Equals, "")
 	c.Assert(stdout.String(), Equals, "")
@@ -75,12 +68,7 @@
 }
 
 func (s *StaterSuite) TestStaterExtraArgs(c *C) {
-	var stdout, stderr bytes.Buffer
-	ctx := &cmd.Context{
-		Stdout: &stdout,
-		Stderr: &stderr,
-	}
-	code := cmd.Main(&StaterCommand{Config: s.config}, ctx, []string{"foo"})
+	stdout, stderr, code := runMain(&StaterCommand{Config: s.config}, "foo")
 	c.Check(code, Equals, 2)
 	c.Assert(stdout.String(), Equals, "")
 	c.Assert(stderr.String(), Matches, "error: unrecognized args.*\n")

=== modified file 'cmd/jujud/version_test.go'
--- cmd/jujud/version_test.go	2012-08-16 17:09:22 +0000
+++ cmd/jujud/version_test.go	2013-01-18 20:33:21 +0000
@@ -1,10 +1,8 @@
 package main
 
 import (
-	"bytes"
 	"fmt"
 	. "launchpad.net/gocheck"
-	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/version"
 )
 
@@ -13,36 +11,21 @@
 var _ = Suite(&VersionSuite{})
 
 func (s *VersionSuite) TestVersion(c *C) {
-	var stdout, stderr bytes.Buffer
-	ctx := &cmd.Context{
-		Stdout: &stdout,
-		Stderr: &stderr,
-	}
-	code := cmd.Main(&VersionCommand{}, ctx, nil)
+	stdout, stderr, code := runMain(&VersionCommand{})
 	c.Check(code, Equals, 0)
 	c.Assert(stderr.String(), Equals, "")
 	c.Assert(stdout.String(), Equals, version.Current.String()+"\n")
 }
 
 func (s *VersionSuite) TestVersionExtraArgs(c *C) {
-	var stdout, stderr bytes.Buffer
-	ctx := &cmd.Context{
-		Stdout: &stdout,
-		Stderr: &stderr,
-	}
-	code := cmd.Main(&VersionCommand{}, ctx, []string{"foo"})
+	stdout, stderr, code := runMain(&VersionCommand{}, "foo")
 	c.Check(code, Equals, 2)
 	c.Assert(stdout.String(), Equals, "")
 	c.Assert(stderr.String(), Matches, "error: unrecognized args.*\n")
 }
 
 func (s *VersionSuite) TestVersionJson(c *C) {
-	var stdout, stderr bytes.Buffer
-	ctx := &cmd.Context{
-		Stdout: &stdout,
-		Stderr: &stderr,
-	}
-	code := cmd.Main(&VersionCommand{}, ctx, []string{"--format", "json"})
+	stdout, stderr, code := runMain(&VersionCommand{}, "--format", "json")
 	c.Check(code, Equals, 0)
 	c.Assert(stderr.String(), Equals, "")
 	c.Assert(stdout.String(), Equals, fmt.Sprintf("%q", version.Current.String())+"\n")