Merge lp:~jameinel/juju-core/only-943 into lp:~juju/juju-core/trunk

[John A Meinel]

revert only r943

William merged a change which reverted trunk back to 942
because rev 943 broke the test suite.

This just re-introduces all of the merges 944-947, so that
Gustavo and Ian don't have to re-propose and get approval
for their changes again.

I've run the test suite to make sure it passes as long as
just 943 has been removed.

In the future, you can just cherrypick-out specific revisions
with (eg):
 bzr merge . -r 943..942

And then run the test suite, and propose it. (Which is essentially
what this patch does, except it also reverts 948 which removed
all of those other revisions.)

https://codereview.appspot.com/7424046/

[John A Meinel (jameinel)]

Reviewers: mp+151005_code.launchpad.net,

Message:
Please take a look.

Description:
revert only r943

William merged a change which reverted trunk back to 942
because rev 943 broke the test suite.

This just re-introduces all of the merges 944-947, so that
Gustavo and Ian don't have to re-propose and get approval
for their changes again.

I've run the test suite to make sure it passes as long as
just 943 has been removed.

In the future, you can just cherrypick-out specific revisions
with (eg):
  bzr merge . -r 943..942

And then run the test suite, and propose it. (Which is essentially
what this patch does, except it also reverts 948 which removed
all of those other revisions.)

https://code.launchpad.net/~jameinel/juju-core/only-943/+merge/151005

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/7424046/

Affected files:
   A [revision details]
   M cmd/cmd.go
   M cmd/cmd_test.go
   M cmd/filevar_test.go
   M cmd/juju/addrelation_test.go
   M cmd/juju/addunit_test.go
   M cmd/juju/bootstrap_test.go
   M cmd/juju/cmd_test.go
   M cmd/juju/config_test.go
   M cmd/juju/constraints_test.go
   M cmd/juju/deploy_test.go
   M cmd/juju/destroymachine_test.go
   M cmd/juju/destroyrelation_test.go
   M cmd/juju/destroyservice_test.go
   M cmd/juju/destroyunit_test.go
   M cmd/juju/expose_test.go
   M cmd/juju/init_test.go
   M cmd/juju/resolved_test.go
   M cmd/juju/scp_test.go
   M cmd/juju/ssh_test.go
   M cmd/juju/status_test.go
   M cmd/juju/unexpose_test.go
   M cmd/juju/upgradejuju_test.go
   M cmd/jujud/agent_test.go
   M cmd/jujud/bootstrap_test.go
   M cmd/logging_test.go
   M cmd/output_test.go
   M cmd/supercommand_test.go
   M cmd/util_test.go
   M environs/agent/agent.go
   M juju/api.go
   M juju/conn.go
   M state/api/api_test.go
   M state/api/error.go
   M state/open.go
   M state/state_test.go
   M state/unit_test.go
   M store/server.go
   M store/server_test.go
   M store/store.go
   M store/store_test.go
   M testing/cmd.go
   M worker/uniter/jujuc/config-get_test.go
   M worker/uniter/jujuc/ports_test.go
   M worker/uniter/jujuc/relation-get_test.go
   M worker/uniter/jujuc/relation-ids_test.go
   M worker/uniter/jujuc/relation-list_test.go
   M worker/uniter/jujuc/relation-set_test.go
   M worker/uniter/jujuc/server.go
   M worker/uniter/jujuc/unit-get_test.go
   M worker/uniter/jujuc/util_test.go

[Ian Booth (wallyworld)]

LGTM. Thanks for doing this.

https://codereview.appspot.com/7424046/

[William Reade (fwereade)]

LGTM -- thank you very much.

https://codereview.appspot.com/7424046/

[John A Meinel (jameinel)]

*** Submitted:

revert only r943

William merged a change which reverted trunk back to 942
because rev 943 broke the test suite.

This just re-introduces all of the merges 944-947, so that
Gustavo and Ian don't have to re-propose and get approval
for their changes again.

I've run the test suite to make sure it passes as long as
just 943 has been removed.

In the future, you can just cherrypick-out specific revisions
with (eg):
  bzr merge . -r 943..942

And then run the test suite, and propose it. (Which is essentially
what this patch does, except it also reverts 948 which removed
all of those other revisions.)

R=wallyworld, fwereade
CC=
https://codereview.appspot.com/7424046

https://codereview.appspot.com/7424046/

=== modified file 'cmd/cmd.go'
--- cmd/cmd.go	2013-02-28 08:11:29 +0000
+++ cmd/cmd.go	2013-02-28 12:30:29 +0000
@@ -165,7 +165,12 @@
 	if err != nil {
 		panic(err)
 	}
-	return &Context{abs, os.Stdin, os.Stdout, os.Stderr}
+	return &Context{
+		Dir:    abs,
+		Stdin:  os.Stdin,
+		Stdout: os.Stdout,
+		Stderr: os.Stderr,
+	}
 }
 
 // CheckEmpty is a utility function that returns an error if args is not empty.

=== modified file 'cmd/cmd_test.go'
--- cmd/cmd_test.go	2013-02-28 08:11:29 +0000
+++ cmd/cmd_test.go	2013-02-28 12:30:29 +0000
@@ -16,7 +16,7 @@
 var _ = Suite(&CmdSuite{})
 
 func (s *CmdSuite) TestContext(c *C) {
-	ctx := dummyContext(c)
+	ctx := testing.Context(c)
 	c.Assert(ctx.AbsPath("/foo/bar"), Equals, "/foo/bar")
 	c.Assert(ctx.AbsPath("foo/bar"), Equals, filepath.Join(ctx.Dir, "foo/bar"))
 }
@@ -49,7 +49,7 @@
 
 func (s *CmdSuite) TestMainInitError(c *C) {
 	for _, t := range initErrorTests {
-		ctx := dummyContext(c)
+		ctx := testing.Context(c)
 		result := cmd.Main(t.c, ctx, []string{"--unknown"})
 		c.Assert(result, Equals, 2)
 		c.Assert(bufferString(ctx.Stdout), Equals, "")
@@ -59,7 +59,7 @@
 }
 
 func (s *CmdSuite) TestMainRunError(c *C) {
-	ctx := dummyContext(c)
+	ctx := testing.Context(c)
 	result := cmd.Main(&TestCommand{Name: "verb"}, ctx, []string{"--option", "error"})
 	c.Assert(result, Equals, 1)
 	c.Assert(bufferString(ctx.Stdout), Equals, "")
@@ -67,7 +67,7 @@
 }
 
 func (s *CmdSuite) TestMainRunSilentError(c *C) {
-	ctx := dummyContext(c)
+	ctx := testing.Context(c)
 	result := cmd.Main(&TestCommand{Name: "verb"}, ctx, []string{"--option", "silent-error"})
 	c.Assert(result, Equals, 1)
 	c.Assert(bufferString(ctx.Stdout), Equals, "")
@@ -75,7 +75,7 @@
 }
 
 func (s *CmdSuite) TestMainSuccess(c *C) {
-	ctx := dummyContext(c)
+	ctx := testing.Context(c)
 	result := cmd.Main(&TestCommand{Name: "verb"}, ctx, []string{"--option", "success!"})
 	c.Assert(result, Equals, 0)
 	c.Assert(bufferString(ctx.Stdout), Equals, "success!\n")
@@ -84,7 +84,7 @@
 
 func (s *CmdSuite) TestStdin(c *C) {
 	const phrase = "Do you, Juju?"
-	ctx := dummyContext(c)
+	ctx := testing.Context(c)
 	ctx.Stdin = bytes.NewBuffer([]byte(phrase))
 	result := cmd.Main(&TestCommand{Name: "verb"}, ctx, []string{"--option", "echo"})
 	c.Assert(result, Equals, 0)
@@ -94,7 +94,7 @@
 
 func (s *CmdSuite) TestMainHelp(c *C) {
 	for _, arg := range []string{"-h", "--help"} {
-		ctx := dummyContext(c)
+		ctx := testing.Context(c)
 		result := cmd.Main(&TestCommand{Name: "verb"}, ctx, []string{arg})
 		c.Assert(result, Equals, 0)
 		c.Assert(bufferString(ctx.Stdout), Equals, "")

=== modified file 'cmd/filevar_test.go'
--- cmd/filevar_test.go	2013-02-28 08:11:29 +0000
+++ cmd/filevar_test.go	2013-02-28 12:30:29 +0000
@@ -17,7 +17,7 @@
 var _ = Suite(&FileVarSuite{})
 
 func (s *FileVarSuite) SetUpTest(c *C) {
-	s.ctx = &cmd.Context{c.MkDir(), nil, nil, nil}
+	s.ctx = testing.Context(c)
 	s.ValidPath = s.ctx.AbsPath("valid.yaml")
 	s.InvalidPath = s.ctx.AbsPath("invalid.yaml")
 	f, err := os.Create(s.ValidPath)

=== modified file 'cmd/juju/addrelation_test.go'
--- cmd/juju/addrelation_test.go	2013-02-28 08:11:29 +0000
+++ cmd/juju/addrelation_test.go	2013-02-28 12:30:29 +0000
@@ -12,7 +12,8 @@
 var _ = Suite(&AddRelationSuite{})
 
 func runAddRelation(c *C, args ...string) error {
-	return testing.RunCommand(c, &AddRelationCommand{}, args)
+	_, err := testing.RunCommand(c, &AddRelationCommand{}, args)
+	return err
 }
 
 var msWpAlreadyExists = `cannot add relation "wp:db ms:server": relation already exists`

=== modified file 'cmd/juju/addunit_test.go'
--- cmd/juju/addunit_test.go	2013-02-28 08:11:29 +0000
+++ cmd/juju/addunit_test.go	2013-02-28 12:30:29 +0000
@@ -13,7 +13,8 @@
 var _ = Suite(&AddUnitSuite{})
 
 func runAddUnit(c *C, args ...string) error {
-	return testing.RunCommand(c, &AddUnitCommand{}, args)
+	_, err := testing.RunCommand(c, &AddUnitCommand{}, args)
+	return err
 }
 
 func (s *AddUnitSuite) TestAddUnit(c *C) {

=== modified file 'cmd/juju/bootstrap_test.go'
--- cmd/juju/bootstrap_test.go	2013-02-28 08:11:29 +0000
+++ cmd/juju/bootstrap_test.go	2013-02-28 12:30:29 +0000
@@ -91,7 +91,7 @@
 func (*BootstrapSuite) TestMissingEnvironment(c *C) {
 	defer makeFakeHome(c, "empty").restore()
 	// bootstrap without an environments.yaml
-	ctx := &cmd.Context{c.MkDir(), &bytes.Buffer{}, &bytes.Buffer{}, &bytes.Buffer{}}
+	ctx := testing.Context(c)
 	code := cmd.Main(&BootstrapCommand{}, ctx, nil)
 	c.Check(code, Equals, 1)
 	errStr := ctx.Stderr.(*bytes.Buffer).String()

=== modified file 'cmd/juju/cmd_test.go'
--- cmd/juju/cmd_test.go	2013-02-28 08:11:29 +0000
+++ cmd/juju/cmd_test.go	2013-02-28 12:30:29 +0000
@@ -198,7 +198,7 @@
 	}
 
 	// test relative --config path
-	ctx := &cmd.Context{c.MkDir(), nil, nil, nil}
+	ctx := coretesting.Context(c)
 	expected := []byte("test: data")
 	path := ctx.AbsPath("testconfig.yaml")
 	file, err := os.Create(path)
@@ -323,7 +323,7 @@
 
 	// test --config path
 	expected := []byte("this: is some test data")
-	ctx := &cmd.Context{c.MkDir(), nil, nil, nil}
+	ctx := coretesting.Context(c)
 	path := ctx.AbsPath("testconfig.yaml")
 	file, err := os.Create(path)
 	c.Assert(err, IsNil)

=== modified file 'cmd/juju/config_test.go'
--- cmd/juju/config_test.go	2013-02-28 08:11:29 +0000
+++ cmd/juju/config_test.go	2013-02-28 12:30:29 +0000
@@ -8,6 +8,7 @@
 	"launchpad.net/goyaml"
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/juju/testing"
+	coretesting "launchpad.net/juju-core/testing"
 )
 
 // juju get and set tests (because one needs the other)
@@ -61,7 +62,7 @@
 	_, err := s.State.AddService("dummy-service", sch)
 	c.Assert(err, IsNil)
 	for _, t := range getTests {
-		ctx := &cmd.Context{c.MkDir(), &bytes.Buffer{}, &bytes.Buffer{}, &bytes.Buffer{}}
+		ctx := coretesting.Context(c)
 		code := cmd.Main(&GetCommand{}, ctx, []string{t.service})
 		c.Check(code, Equals, 0)
 		c.Assert(ctx.Stderr.(*bytes.Buffer).String(), Equals, "")
@@ -129,7 +130,7 @@
 	for i, t := range setTests {
 		args := append([]string{"dummy-service"}, t.args...)
 		c.Logf("test %d. %s", i, t.about)
-		ctx := &cmd.Context{dir, &bytes.Buffer{}, &bytes.Buffer{}, &bytes.Buffer{}}
+		ctx := coretesting.ContextForDir(c, dir)
 		code := cmd.Main(&SetCommand{}, ctx, args)
 		if t.err != "" {
 			c.Check(code, Not(Equals), 0)
@@ -144,7 +145,7 @@
 }
 
 func setupConfigfile(c *C, dir string) {
-	ctx := &cmd.Context{dir, nil, nil, nil}
+	ctx := coretesting.ContextForDir(c, dir)
 	path := ctx.AbsPath("testconfig.yaml")
 	file, err := os.Create(path)
 	c.Assert(err, IsNil)

=== modified file 'cmd/juju/constraints_test.go'
--- cmd/juju/constraints_test.go	2013-02-28 08:11:29 +0000
+++ cmd/juju/constraints_test.go	2013-02-28 12:30:29 +0000
@@ -6,6 +6,7 @@
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
+	coretesting "launchpad.net/juju-core/testing"
 )
 
 type ConstraintsCommandsSuite struct {
@@ -15,7 +16,7 @@
 var _ = Suite(&ConstraintsCommandsSuite{})
 
 func runCmdLine(c *C, com cmd.Command, args ...string) (code int, stdout, stderr string) {
-	ctx := &cmd.Context{c.MkDir(), &bytes.Buffer{}, &bytes.Buffer{}, &bytes.Buffer{}}
+	ctx := coretesting.Context(c)
 	code = cmd.Main(com, ctx, args)
 	stdout = ctx.Stdout.(*bytes.Buffer).String()
 	stderr = ctx.Stderr.(*bytes.Buffer).String()

=== modified file 'cmd/juju/deploy_test.go'
--- cmd/juju/deploy_test.go	2013-02-28 08:11:29 +0000
+++ cmd/juju/deploy_test.go	2013-02-28 12:30:29 +0000
@@ -106,7 +106,8 @@
 var _ = Suite(&DeploySuite{})
 
 func runDeploy(c *C, args ...string) error {
-	return coretesting.RunCommand(c, &DeployCommand{}, args)
+	_, err := coretesting.RunCommand(c, &DeployCommand{}, args)
+	return err
 }
 
 var initErrorTests = []struct {

=== modified file 'cmd/juju/destroymachine_test.go'
--- cmd/juju/destroymachine_test.go	2013-02-28 08:11:29 +0000
+++ cmd/juju/destroymachine_test.go	2013-02-28 12:30:29 +0000
@@ -13,7 +13,8 @@
 var _ = Suite(&DestroyMachineSuite{})
 
 func runDestroyMachine(c *C, args ...string) error {
-	return testing.RunCommand(c, &DestroyMachineCommand{}, args)
+	_, err := testing.RunCommand(c, &DestroyMachineCommand{}, args)
+	return err
 }
 
 func (s *DestroyMachineSuite) TestDestroyMachine(c *C) {

=== modified file 'cmd/juju/destroyrelation_test.go'
--- cmd/juju/destroyrelation_test.go	2013-02-28 08:11:29 +0000
+++ cmd/juju/destroyrelation_test.go	2013-02-28 12:30:29 +0000
@@ -12,7 +12,8 @@
 var _ = Suite(&DestroyRelationSuite{})
 
 func runDestroyRelation(c *C, args ...string) error {
-	return testing.RunCommand(c, &DestroyRelationCommand{}, args)
+	_, err := testing.RunCommand(c, &DestroyRelationCommand{}, args)
+	return err
 }
 
 func (s *DestroyRelationSuite) TestDestroyRelation(c *C) {

=== modified file 'cmd/juju/destroyservice_test.go'
--- cmd/juju/destroyservice_test.go	2013-02-28 08:11:29 +0000
+++ cmd/juju/destroyservice_test.go	2013-02-28 12:30:29 +0000
@@ -13,7 +13,8 @@
 var _ = Suite(&DestroyServiceSuite{})
 
 func runDestroyService(c *C, args ...string) error {
-	return testing.RunCommand(c, &DestroyServiceCommand{}, args)
+	_, err := testing.RunCommand(c, &DestroyServiceCommand{}, args)
+	return err
 }
 
 func (s *DestroyServiceSuite) TestSuccess(c *C) {

=== modified file 'cmd/juju/destroyunit_test.go'
--- cmd/juju/destroyunit_test.go	2013-02-28 08:11:29 +0000
+++ cmd/juju/destroyunit_test.go	2013-02-28 12:30:29 +0000
@@ -14,7 +14,8 @@
 var _ = Suite(&DestroyUnitSuite{})
 
 func runDestroyUnit(c *C, args ...string) error {
-	return testing.RunCommand(c, &DestroyUnitCommand{}, args)
+	_, err := testing.RunCommand(c, &DestroyUnitCommand{}, args)
+	return err
 }
 
 func (s *DestroyUnitSuite) TestDestroyUnit(c *C) {

=== modified file 'cmd/juju/expose_test.go'
--- cmd/juju/expose_test.go	2013-02-28 08:11:29 +0000
+++ cmd/juju/expose_test.go	2013-02-28 12:30:29 +0000
@@ -13,7 +13,8 @@
 var _ = Suite(&ExposeSuite{})
 
 func runExpose(c *C, args ...string) error {
-	return testing.RunCommand(c, &ExposeCommand{}, args)
+	_, err := testing.RunCommand(c, &ExposeCommand{}, args)
+	return err
 }
 
 func (s *ExposeSuite) assertExposed(c *C, service string) {

=== modified file 'cmd/juju/init_test.go'
--- cmd/juju/init_test.go	2013-02-28 08:11:29 +0000
+++ cmd/juju/init_test.go	2013-02-28 12:30:29 +0000
@@ -1,12 +1,12 @@
 package main
 
 import (
+	"bytes"
 	"io/ioutil"
-
-	"bytes"
 	. "launchpad.net/gocheck"
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/environs"
+	"launchpad.net/juju-core/testing"
 	"strings"
 )
 
@@ -18,7 +18,7 @@
 func (*InitSuite) TestBoilerPlateEnvironment(c *C) {
 	defer makeFakeHome(c, "empty").restore()
 	// run without an environments.yaml
-	ctx := &cmd.Context{c.MkDir(), &bytes.Buffer{}, &bytes.Buffer{}, &bytes.Buffer{}}
+	ctx := testing.Context(c)
 	code := cmd.Main(&InitCommand{}, ctx, []string{"-w"})
 	c.Check(code, Equals, 0)
 	outStr := ctx.Stdout.(*bytes.Buffer).String()
@@ -44,7 +44,7 @@
 	_, err := environs.WriteEnvirons(environpath, env)
 	c.Assert(err, IsNil)
 
-	ctx := &cmd.Context{c.MkDir(), &bytes.Buffer{}, &bytes.Buffer{}, &bytes.Buffer{}}
+	ctx := testing.Context(c)
 	code := cmd.Main(&InitCommand{}, ctx, []string{"-w"})
 	c.Check(code, Equals, 0)
 	errOut := ctx.Stdout.(*bytes.Buffer).String()
@@ -70,7 +70,7 @@
 	_, err := environs.WriteEnvirons(environpath, env)
 	c.Assert(err, IsNil)
 
-	ctx := &cmd.Context{c.MkDir(), &bytes.Buffer{}, &bytes.Buffer{}, &bytes.Buffer{}}
+	ctx := testing.Context(c)
 	code := cmd.Main(&InitCommand{}, ctx, nil)
 	c.Check(code, Equals, 0)
 	errOut := ctx.Stdout.(*bytes.Buffer).String()

=== modified file 'cmd/juju/resolved_test.go'
--- cmd/juju/resolved_test.go	2013-02-28 08:11:29 +0000
+++ cmd/juju/resolved_test.go	2013-02-28 12:30:29 +0000
@@ -13,7 +13,8 @@
 var _ = Suite(&ResolvedSuite{})
 
 func runResolved(c *C, args []string) error {
-	return testing.RunCommand(c, &ResolvedCommand{}, args)
+	_, err := testing.RunCommand(c, &ResolvedCommand{}, args)
+	return err
 }
 
 var resolvedTests = []struct {

=== modified file 'cmd/juju/scp_test.go'
--- cmd/juju/scp_test.go	2013-02-28 08:11:29 +0000
+++ cmd/juju/scp_test.go	2013-02-28 12:30:29 +0000
@@ -63,7 +63,7 @@
 
 	for _, t := range scpTests {
 		c.Logf("testing juju scp %s", t.args)
-		ctx := &cmd.Context{c.MkDir(), &bytes.Buffer{}, &bytes.Buffer{}, &bytes.Buffer{}}
+		ctx := coretesting.Context(c)
 		code := cmd.Main(&SCPCommand{}, ctx, t.args)
 		c.Check(code, Equals, 0)
 		c.Check(ctx.Stderr.(*bytes.Buffer).String(), Equals, "")

=== modified file 'cmd/juju/ssh_test.go'
--- cmd/juju/ssh_test.go	2013-02-28 08:11:29 +0000
+++ cmd/juju/ssh_test.go	2013-02-28 12:30:29 +0000
@@ -107,7 +107,7 @@
 
 	for _, t := range sshTests {
 		c.Logf("testing juju ssh %s", t.args)
-		ctx := &cmd.Context{c.MkDir(), &bytes.Buffer{}, &bytes.Buffer{}, &bytes.Buffer{}}
+		ctx := coretesting.Context(c)
 		code := cmd.Main(&SSHCommand{}, ctx, t.args)
 		c.Check(code, Equals, 0)
 		c.Check(ctx.Stderr.(*bytes.Buffer).String(), Equals, "")

=== modified file 'cmd/juju/status_test.go'
--- cmd/juju/status_test.go	2013-02-28 08:11:29 +0000
+++ cmd/juju/status_test.go	2013-02-28 12:30:29 +0000
@@ -248,7 +248,7 @@
 	for _, t := range statusTests {
 		c.Logf("testing %s: %s", format, t.title)
 		t.prepare(s.State, s.Conn, c)
-		ctx := &cmd.Context{c.MkDir(), &bytes.Buffer{}, &bytes.Buffer{}, &bytes.Buffer{}}
+		ctx := coretesting.Context(c)
 		code := cmd.Main(&StatusCommand{}, ctx, []string{"--format", format})
 		c.Check(code, Equals, 0)
 		c.Assert(ctx.Stderr.(*bytes.Buffer).String(), Equals, "")

=== modified file 'cmd/juju/unexpose_test.go'
--- cmd/juju/unexpose_test.go	2013-02-28 08:11:29 +0000
+++ cmd/juju/unexpose_test.go	2013-02-28 12:30:29 +0000
@@ -13,7 +13,8 @@
 var _ = Suite(&UnexposeSuite{})
 
 func runUnexpose(c *C, args ...string) error {
-	return testing.RunCommand(c, &UnexposeCommand{}, args)
+	_, err := testing.RunCommand(c, &UnexposeCommand{}, args)
+	return err
 }
 
 func (s *UnexposeSuite) assertExposed(c *C, service string, expected bool) {

=== modified file 'cmd/juju/upgradejuju_test.go'
--- cmd/juju/upgradejuju_test.go	2013-02-28 08:11:29 +0000
+++ cmd/juju/upgradejuju_test.go	2013-02-28 12:30:29 +0000
@@ -3,7 +3,6 @@
 import (
 	"io/ioutil"
 	. "launchpad.net/gocheck"
-	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
@@ -188,7 +187,7 @@
 			c.Check(err, ErrorMatches, test.expectInitErr)
 			continue
 		}
-		err = com.Run(&cmd.Context{c.MkDir(), nil, ioutil.Discard, ioutil.Discard})
+		err = com.Run(coretesting.Context(c))
 		if test.expectErr != "" {
 			c.Check(err, ErrorMatches, test.expectErr)
 			continue
@@ -230,7 +229,7 @@
 
 func (s *UpgradeJujuSuite) TestUpgradeJujuWithRealPutTools(c *C) {
 	s.Reset(c)
-	err := coretesting.RunCommand(c, &UpgradeJujuCommand{}, []string{"--upload-tools", "--dev"})
+	_, err := coretesting.RunCommand(c, &UpgradeJujuCommand{}, []string{"--upload-tools", "--dev"})
 	c.Assert(err, IsNil)
 	p := environs.ToolsStoragePath(version.Current)
 	r, err := s.Conn.Environ.Storage().Get(p)

=== modified file 'cmd/jujud/agent_test.go'
--- cmd/jujud/agent_test.go	2013-02-28 08:11:29 +0000
+++ cmd/jujud/agent_test.go	2013-02-28 12:30:29 +0000
@@ -342,7 +342,7 @@
 	info := s.StateInfo(c)
 	info.EntityName = ent.EntityName()
 	info.Password = "initial"
-	testOpenState(c, info, state.ErrUnauthorized)
+	testOpenState(c, info, state.Unauthorizedf("unauth"))
 
 	// Read the configuration and check that we can connect with it.
 	c.Assert(refreshConfig(conf), IsNil)

=== modified file 'cmd/jujud/bootstrap_test.go'
--- cmd/jujud/bootstrap_test.go	2013-02-28 08:11:29 +0000
+++ cmd/jujud/bootstrap_test.go	2013-02-28 12:30:29 +0000
@@ -145,7 +145,7 @@
 		st.Close()
 	}
 	if expectErr != nil {
-		c.Assert(err, Equals, expectErr)
+		c.Assert(state.IsUnauthorizedError(err), Equals, true)
 	} else {
 		c.Assert(err, IsNil)
 	}
@@ -177,7 +177,7 @@
 		Addrs:  []string{testing.MgoAddr},
 		CACert: []byte(testing.CACert),
 	}
-	testOpenState(c, info, state.ErrUnauthorized)
+	testOpenState(c, info, state.Unauthorizedf("some auth problem"))
 
 	info.EntityName, info.Password = "machine-0", "foo"
 	testOpenState(c, info, nil)

=== modified file 'cmd/logging_test.go'
--- cmd/logging_test.go	2013-02-28 08:11:29 +0000
+++ cmd/logging_test.go	2013-02-28 12:30:29 +0000
@@ -61,7 +61,7 @@
 		{"foo", false, false, NotNil},
 	} {
 		l := &cmd.Log{t.path, t.verbose, t.debug}
-		ctx := dummyContext(c)
+		ctx := testing.Context(c)
 		err := l.Start(ctx)
 		c.Assert(err, IsNil)
 		c.Assert(log.Target, t.target)
@@ -71,7 +71,7 @@
 
 func (s *LogSuite) TestStderr(c *C) {
 	l := &cmd.Log{Verbose: true}
-	ctx := dummyContext(c)
+	ctx := testing.Context(c)
 	err := l.Start(ctx)
 	c.Assert(err, IsNil)
 	log.Printf("hello")
@@ -80,7 +80,7 @@
 
 func (s *LogSuite) TestRelPathLog(c *C) {
 	l := &cmd.Log{Path: "foo.log"}
-	ctx := dummyContext(c)
+	ctx := testing.Context(c)
 	err := l.Start(ctx)
 	c.Assert(err, IsNil)
 	log.Printf("hello")
@@ -93,7 +93,7 @@
 func (s *LogSuite) TestAbsPathLog(c *C) {
 	path := filepath.Join(c.MkDir(), "foo.log")
 	l := &cmd.Log{Path: path}
-	ctx := dummyContext(c)
+	ctx := testing.Context(c)
 	err := l.Start(ctx)
 	c.Assert(err, IsNil)
 	log.Printf("hello")

=== modified file 'cmd/output_test.go'
--- cmd/output_test.go	2013-02-28 08:11:29 +0000
+++ cmd/output_test.go	2013-02-28 12:30:29 +0000
@@ -4,6 +4,7 @@
 	"launchpad.net/gnuflag"
 	. "launchpad.net/gocheck"
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/testing"
 )
 
 // OutputCommand is a command that uses the output.go formatters.
@@ -102,7 +103,7 @@
 		}
 		for i, t := range tests {
 			c.Logf("  test %d", i)
-			ctx := dummyContext(c)
+			ctx := testing.Context(c)
 			result := cmd.Main(&OutputCommand{value: t.value}, ctx, args)
 			c.Assert(result, Equals, 0)
 			c.Assert(bufferString(ctx.Stdout), Equals, t.output)
@@ -110,7 +111,7 @@
 		}
 	}
 
-	ctx := dummyContext(c)
+	ctx := testing.Context(c)
 	result := cmd.Main(&OutputCommand{}, ctx, []string{"--format", "cuneiform"})
 	c.Assert(result, Equals, 2)
 	c.Assert(bufferString(ctx.Stdout), Equals, "")
@@ -122,7 +123,7 @@
 // this argument format.
 // LP #1059921
 func (s *CmdSuite) TestFormatAlternativeSyntax(c *C) {
-	ctx := dummyContext(c)
+	ctx := testing.Context(c)
 	result := cmd.Main(&OutputCommand{}, ctx, []string{"--format=json"})
 	c.Assert(result, Equals, 0)
 	c.Assert(bufferString(ctx.Stdout), Equals, "null\n")

=== modified file 'cmd/supercommand_test.go'
--- cmd/supercommand_test.go	2013-02-28 08:11:29 +0000
+++ cmd/supercommand_test.go	2013-02-28 12:30:29 +0000
@@ -99,7 +99,7 @@
 	}()
 	jc := &cmd.SuperCommand{Name: "jujutest", Log: &cmd.Log{}}
 	jc.Register(&TestCommand{Name: "blah"})
-	ctx := dummyContext(c)
+	ctx := testing.Context(c)
 	code := cmd.Main(jc, ctx, []string{"blah", "--option", "error", "--debug"})
 	c.Assert(code, Equals, 1)
 	c.Assert(bufferString(ctx.Stderr), Matches, `.* JUJU jujutest blah command failed: BAM!

=== modified file 'cmd/util_test.go'
--- cmd/util_test.go	2013-02-28 08:11:29 +0000
+++ cmd/util_test.go	2013-02-28 12:30:29 +0000
@@ -6,14 +6,9 @@
 	"fmt"
 	"io"
 	"launchpad.net/gnuflag"
-	. "launchpad.net/gocheck"
 	"launchpad.net/juju-core/cmd"
 )
 
-func dummyContext(c *C) *cmd.Context {
-	return &cmd.Context{c.MkDir(), &bytes.Buffer{}, &bytes.Buffer{}, &bytes.Buffer{}}
-}
-
 func bufferString(stream io.Writer) string {
 	return stream.(*bytes.Buffer).String()
 }

=== modified file 'environs/agent/agent.go'
--- environs/agent/agent.go	2013-02-28 08:11:29 +0000
+++ environs/agent/agent.go	2013-02-28 12:30:29 +0000
@@ -205,7 +205,7 @@
 		if err == nil {
 			return st, "", nil
 		}
-		if err != state.ErrUnauthorized {
+		if !state.IsUnauthorizedError(err) {
 			return nil, "", err
 		}
 		// Access isn't authorized even though we have a password

=== modified file 'juju/api.go'
--- juju/api.go	2013-02-28 08:11:29 +0000
+++ juju/api.go	2013-02-28 12:30:29 +0000
@@ -29,7 +29,7 @@
 	info.Password = password
 
 	st, err := api.Open(info)
-	// TODO(rog): handle ErrUnauthorized when the API handles passwords.
+	// TODO(rog): handle errUnauthorized when the API handles passwords.
 	if err != nil {
 		return nil, err
 	}

=== modified file 'juju/conn.go'
--- juju/conn.go	2013-02-28 08:11:29 +0000
+++ juju/conn.go	2013-02-28 12:30:29 +0000
@@ -43,7 +43,7 @@
 	}
 	info.Password = password
 	st, err := state.Open(info)
-	if err == state.ErrUnauthorized {
+	if state.IsUnauthorizedError(err) {
 		// We can't connect with the administrator password,;
 		// perhaps this was the first connection and the
 		// password has not been changed yet.
@@ -54,7 +54,7 @@
 		// initialized and the initial password set.
 		for a := redialStrategy.Start(); a.Next(); {
 			st, err = state.Open(info)
-			if err != state.ErrUnauthorized {
+			if !state.IsUnauthorizedError(err) {
 				break
 			}
 		}

=== modified file 'state/api/api_test.go'
--- state/api/api_test.go	2013-02-28 08:11:29 +0000
+++ state/api/api_test.go	2013-02-28 12:30:29 +0000
@@ -679,7 +679,7 @@
 	c.Assert(ok, Equals, true)
 
 	// Wait long enough for the Next request to be sent
-	// so it's blocking on the server side. 
+	// so it's blocking on the server side.
 	time.Sleep(50 * time.Millisecond)
 	c.Logf("stopping server")
 	err = srv.Stop()
@@ -752,7 +752,7 @@
 	err:  state.NotFoundf("hello"),
 	code: api.CodeNotFound,
 }, {
-	err:  state.ErrUnauthorized,
+	err:  state.Unauthorizedf("hello"),
 	code: api.CodeUnauthorized,
 }, {
 	err:  state.ErrCannotEnterScopeYet,

=== modified file 'state/api/error.go'
--- state/api/error.go	2013-02-28 08:11:29 +0000
+++ state/api/error.go	2013-02-28 12:30:29 +0000
@@ -33,7 +33,6 @@
 )
 
 var singletonErrorCodes = map[error]string{
-	state.ErrUnauthorized:        CodeUnauthorized,
 	state.ErrCannotEnterScopeYet: CodeCannotEnterScopeYet,
 	state.ErrCannotEnterScope:    CodeCannotEnterScope,
 	state.ErrExcessiveContention: CodeExcessiveContention,
@@ -62,6 +61,8 @@
 	code := singletonErrorCodes[err]
 	switch {
 	case code != "":
+	case state.IsUnauthorizedError(err):
+		code = CodeUnauthorized
 	case state.IsNotFound(err):
 		code = CodeNotFound
 	case state.IsNotAssigned(err):

=== modified file 'state/open.go'
--- state/open.go	2013-02-28 08:11:29 +0000
+++ state/open.go	2013-02-28 12:30:29 +0000
@@ -42,7 +42,7 @@
 // Open connects to the server described by the given
 // info, waits for it to be initialized, and returns a new State
 // representing the environment connected to.
-// It returns ErrUnauthorized if access is unauthorized.
+// It returns unauthorizedError if access is unauthorized.
 func Open(info *Info) (*State, error) {
 	log.Printf("state: opening state; mongo addresses: %q; entity %q", info.Addrs, info.EntityName)
 	if len(info.Addrs) == 0 {
@@ -89,7 +89,7 @@
 
 // Initialize sets up an initial empty state and returns it.
 // This needs to be performed only once for a given environment.
-// It returns ErrUnauthorized if access is unauthorized.
+// It returns unauthorizedError if access is unauthorized.
 func Initialize(info *Info, cfg *config.Config) (rst *State, err error) {
 	st, err := Open(info)
 	if err != nil {
@@ -148,7 +148,30 @@
 	logSizeTests = 1000000
 )
 
-var ErrUnauthorized = errors.New("unauthorized access")
+// unauthorizedError represents the error that an operation is unauthorized.
+// Use IsUnauthorized() to determine if the error was related to authorization failure.
+type unauthorizedError struct {
+	msg string
+	error
+}
+
+func IsUnauthorizedError(err error) bool {
+	_, ok := err.(*unauthorizedError)
+	return ok
+}
+
+func (e *unauthorizedError) Error() string {
+	if e.error != nil {
+		return fmt.Sprintf("%s: %v", e.msg, e.error.Error())
+	}
+	return e.msg
+}
+
+// Unauthorizedf returns an error for which IsUnauthorizedError returns true.
+// It is mainly used for testing.
+func Unauthorizedf(format string, args ...interface{}) error {
+	return &unauthorizedError{fmt.Sprintf(format, args...), nil}
+}
 
 func maybeUnauthorized(err error, msg string) error {
 	if err == nil {
@@ -157,10 +180,10 @@
 	// Unauthorized access errors have no error code,
 	// just a simple error string.
 	if err.Error() == "auth fails" {
-		return ErrUnauthorized
+		return &unauthorizedError{msg, err}
 	}
 	if err, ok := err.(*mgo.QueryError); ok && err.Code == 10057 {
-		return ErrUnauthorized
+		return &unauthorizedError{msg, err}
 	}
 	return fmt.Errorf("%s: %v", msg, err)
 }

=== modified file 'state/state_test.go'
--- state/state_test.go	2013-02-28 08:11:29 +0000
+++ state/state_test.go	2013-02-28 12:30:29 +0000
@@ -1173,11 +1173,11 @@
 	info := state.TestingStateInfo()
 	info.EntityName, info.Password = "arble", "bar"
 	err := tryOpenState(info)
-	c.Assert(err, Equals, state.ErrUnauthorized)
+	c.Assert(state.IsUnauthorizedError(err), Equals, true)
 
 	info.EntityName, info.Password = "arble", ""
 	err = tryOpenState(info)
-	c.Assert(err, Equals, state.ErrUnauthorized)
+	c.Assert(state.IsUnauthorizedError(err), Equals, true)
 
 	info.EntityName, info.Password = "", ""
 	err = tryOpenState(info)
@@ -1253,7 +1253,7 @@
 	info.EntityName = ent.EntityName()
 	info.Password = "bar"
 	err = tryOpenState(info)
-	c.Assert(err, Equals, state.ErrUnauthorized)
+	c.Assert(state.IsUnauthorizedError(err), Equals, true)
 
 	// Check that we can log in with the correct password.
 	info.Password = "foo"
@@ -1271,7 +1271,7 @@
 	// Check that we cannot log in with the old password.
 	info.Password = "foo"
 	err = tryOpenState(info)
-	c.Assert(err, Equals, state.ErrUnauthorized)
+	c.Assert(state.IsUnauthorizedError(err), Equals, true)
 
 	// Check that we can log in with the correct password.
 	info.Password = "bar"
@@ -1299,7 +1299,7 @@
 	defer s.State.SetAdminMongoPassword("")
 	info := state.TestingStateInfo()
 	err = tryOpenState(info)
-	c.Assert(err, Equals, state.ErrUnauthorized)
+	c.Assert(state.IsUnauthorizedError(err), Equals, true)
 
 	info.Password = "foo"
 	err = tryOpenState(info)

=== modified file 'state/unit_test.go'
--- state/unit_test.go	2013-02-28 08:11:29 +0000
+++ state/unit_test.go	2013-02-28 12:30:29 +0000
@@ -214,7 +214,7 @@
 	info.EntityName = m.EntityName()
 	info.Password = "foo1"
 	err = tryOpenState(info)
-	c.Assert(err, Equals, state.ErrUnauthorized)
+	c.Assert(state.IsUnauthorizedError(err), Equals, true)
 
 	// Connect as the machine entity.
 	info.EntityName = m.EntityName()

=== modified file 'store/server.go'
--- store/server.go	2013-02-28 08:11:29 +0000
+++ store/server.go	2013-02-28 12:30:29 +0000
@@ -156,17 +156,22 @@
 		return
 	}
 	key := strings.Split(base, ":")
+	r.ParseForm()
+	listing := r.Form.Get("list") == "1"
 	prefix := false
 	if key[len(key)-1] == "*" {
 		prefix = true
 		key = key[:len(key)-1]
-		if len(key) == 0 {
+		if len(key) == 0 && !listing {
 			// No point in counting something unknown.
 			w.WriteHeader(http.StatusForbidden)
 			return
 		}
 	}
-	r.ParseForm()
+	if listing && prefix {
+		s.serveStatsList(w, r, key)
+		return
+	}
 	sum, err := s.store.SumCounter(key, prefix)
 	if err != nil {
 		log.Printf("store: cannot sum counter: %v", err)
@@ -174,6 +179,10 @@
 		return
 	}
 	data := []byte(strconv.FormatInt(sum, 10))
+	if listing {
+		// Listing a single item.. silly, but whatever.
+		data = []byte(base + "  " + string(data) + "\n")
+	}
 	w.Header().Set("Content-Type", "text/plain")
 	w.Header().Set("Content-Length", strconv.Itoa(len(data)))
 	_, err = w.Write(data)
@@ -183,6 +192,62 @@
 	}
 }
 
+func (s *Server) serveStatsList(w http.ResponseWriter, r *http.Request, prefix []string) {
+	entries, err := s.store.ListCounters(prefix)
+	if err != nil {
+		log.Printf("store: cannot list counter: %v", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	// First build keys and figure max key length.
+	var buf []byte
+	var maxKeyLength int
+	type resultItem struct {
+		key   string
+		count int64
+	}
+	var result []resultItem
+	for i := range entries {
+		entry := &entries[i]
+		for j := range entry.Key {
+			buf = append(buf, entry.Key[j]...)
+			buf = append(buf, ':')
+		}
+		if entry.Prefix {
+			buf = append(buf, '*')
+		} else {
+			buf = buf[:len(buf)-1]
+		}
+		if maxKeyLength < len(buf) {
+			maxKeyLength = len(buf)
+		}
+		result = append(result, resultItem{string(buf), entry.Count})
+		buf = buf[:0]
+	}
+
+	// Then join all keys and counts in a single formatted buffer.
+	spaces := make([]byte, maxKeyLength+2)
+	for i := range spaces {
+		spaces[i] = ' '
+	}
+	for i := range result {
+		item := &result[i]
+		buf = append(buf, item.key...)
+		buf = append(buf, spaces[len(item.key):]...)
+		buf = strconv.AppendInt(buf, item.count, 10)
+		buf = append(buf, '\n')
+	}
+
+	w.Header().Set("Content-Type", "text/plain")
+	w.Header().Set("Content-Length", strconv.Itoa(len(buf)))
+	_, err = w.Write(buf)
+	if err != nil {
+		log.Printf("store: cannot write content: %v", err)
+		w.WriteHeader(http.StatusInternalServerError)
+	}
+}
+
 func (s *Server) serveBlitzKey(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Connection", "close")
 	w.Header().Set("Content-Type", "text/plain")

=== modified file 'store/server_test.go'
--- store/server_test.go	2013-02-28 08:11:29 +0000
+++ store/server_test.go	2013-02-28 12:30:29 +0000
@@ -163,7 +163,7 @@
 }
 
 func (s *StoreSuite) TestStatsCounter(c *C) {
-	for _, key := range [][]string{{"a", "b"}, {"a", "b"}, {"a"}} {
+	for _, key := range [][]string{{"a", "b"}, {"a", "b"}, {"a", "c"}, {"a"}} {
 		err := s.store.IncCounter(key)
 		c.Assert(err, IsNil)
 	}
@@ -171,9 +171,11 @@
 	server, _ := s.prepareServer(c)
 
 	expected := map[string]string{
-		"a:b": "2",
-		"a:*": "3",
-		"a":   "1",
+		"a:b":   "2",
+		"a:b:*": "0",
+		"a:*":   "3",
+		"a":     "1",
+		"a:b:c": "0",
 	}
 
 	for counter, n := range expected {
@@ -190,6 +192,47 @@
 	}
 }
 
+func (s *StoreSuite) TestStatsCounterList(c *C) {
+	incs := [][]string{
+		{"a"},
+		{"a", "b"},
+		{"a", "b", "c"},
+		{"a", "b", "c"},
+		{"a", "b", "d"},
+		{"a", "b", "e"},
+		{"a", "f", "g"},
+		{"a", "f", "h"},
+		{"a", "i"},
+		{"j", "k"},
+	}
+	for _, key := range incs {
+		err := s.store.IncCounter(key)
+		c.Assert(err, IsNil)
+	}
+
+	server, _ := s.prepareServer(c)
+
+	tests := [][]string{
+		{"a", "a  1\n"},
+		{"a:*", "a:b:*  4\na:f:*  2\na:b    1\na:i    1\n"},
+		{"a:b:*", "a:b:c  2\na:b:d  1\na:b:e  1\n"},
+	}
+
+	for i := range tests {
+		req, err := http.NewRequest("GET", "/stats/counter/"+tests[i][0], nil)
+		c.Assert(err, IsNil)
+		req.Form = url.Values{"list": []string{"1"}}
+		rec := httptest.NewRecorder()
+		server.ServeHTTP(rec, req)
+
+		data, err := ioutil.ReadAll(rec.Body)
+		c.Assert(string(data), Equals, tests[i][1])
+
+		c.Assert(rec.Header().Get("Content-Type"), Equals, "text/plain")
+		c.Assert(rec.Header().Get("Content-Length"), Equals, strconv.Itoa(len(tests[i][1])))
+	}
+}
+
 func (s *StoreSuite) TestBlitzKey(c *C) {
 	server, _ := s.prepareServer(c)
 

=== modified file 'store/store.go'
--- store/store.go	2013-02-28 08:11:29 +0000
+++ store/store.go	2013-02-28 12:30:29 +0000
@@ -16,6 +16,7 @@
 	"launchpad.net/juju-core/log"
 	"sort"
 	"strconv"
+	"strings"
 	"sync"
 	"time"
 )
@@ -45,8 +46,10 @@
 
 	// Cache for statistics key words (two generations).
 	cacheMu       sync.RWMutex
-	statsTokenNew map[string]int
-	statsTokenOld map[string]int
+	statsIdNew    map[string]int
+	statsIdOld    map[string]int
+	statsTokenNew map[int]string
+	statsTokenOld map[int]string
 }
 
 // Open creates a new session with the store. It connects to the MongoDB
@@ -130,10 +133,7 @@
 		err = nil
 		id, found := s.statsTokenId(key[i])
 		if !found {
-			var t struct {
-				Id    int    "_id"
-				Token string "t"
-			}
+			var t tokenId
 			err = tokens.Find(bson.D{{"t", key[i]}}).One(&t)
 			if err == mgo.ErrNotFound {
 				if !write {
@@ -163,7 +163,12 @@
 	return string(skey), nil
 }
 
-const statsTokenCacheSize = 512
+const statsTokenCacheSize = 1024
+
+type tokenId struct {
+	Id    int    "_id"
+	Token string "t"
+}
 
 // cacheStatsTokenId adds the id for token into the cache.
 // The cache has two generations so that the least frequently used
@@ -172,25 +177,45 @@
 	s.cacheMu.Lock()
 	defer s.cacheMu.Unlock()
 	// Can't possibly be >, but reviews want it for defensiveness.
-	if len(s.statsTokenNew) >= statsTokenCacheSize {
+	if len(s.statsIdNew) >= statsTokenCacheSize {
+		s.statsIdOld = s.statsIdNew
+		s.statsIdNew = nil
 		s.statsTokenOld = s.statsTokenNew
 		s.statsTokenNew = nil
 	}
-	if s.statsTokenNew == nil {
-		s.statsTokenNew = make(map[string]int, statsTokenCacheSize)
+	if s.statsIdNew == nil {
+		s.statsIdNew = make(map[string]int, statsTokenCacheSize)
+		s.statsTokenNew = make(map[int]string, statsTokenCacheSize)
 	}
-	s.statsTokenNew[token] = id
+	s.statsIdNew[token] = id
+	s.statsTokenNew[id] = token
 }
 
 // statsTokenId returns the id for token from the cache, if found.
 func (s *Store) statsTokenId(token string) (id int, found bool) {
 	s.cacheMu.RLock()
-	id, found = s.statsTokenNew[token]
-	if found {
-		s.cacheMu.RUnlock()
-		return
-	}
-	id, found = s.statsTokenOld[token]
+	id, found = s.statsIdNew[token]
+	if found {
+		s.cacheMu.RUnlock()
+		return
+	}
+	id, found = s.statsIdOld[token]
+	s.cacheMu.RUnlock()
+	if found {
+		s.cacheStatsTokenId(token, id)
+	}
+	return
+}
+
+// statsIdToken returns the token for id from the cache, if found.
+func (s *Store) statsIdToken(id int) (token string, found bool) {
+	s.cacheMu.RLock()
+	token, found = s.statsTokenNew[id]
+	if found {
+		s.cacheMu.RUnlock()
+		return
+	}
+	token, found = s.statsTokenOld[id]
 	s.cacheMu.RUnlock()
 	if found {
 		s.cacheStatsTokenId(token, id)
@@ -219,7 +244,8 @@
 }
 
 // SumCounter returns the sum of all the counters that exactly match key,
-// or that are prefixed by it if prefix is true.
+// or that are prefixed by it if prefix is true. In the latter case, a key
+// that matches the prefix exactly won't be included in the sum.
 func (s *Store) SumCounter(key []string, prefix bool) (count int64, err error) {
 	session := s.session.Copy()
 	defer session.Close()
@@ -234,7 +260,7 @@
 
 	var regex string
 	if prefix {
-		regex = "^" + skey
+		regex = "^" + skey + ".+"
 	} else {
 		regex = "^" + skey + "$"
 	}
@@ -252,6 +278,125 @@
 	return 0, err
 }
 
+type Counter struct {
+	Key    []string
+	Count  int64
+	Prefix bool
+}
+
+// ListCounters returns a list of all keys directly under the provided prefix,
+// and a prefix-aggregated view of deeper keys.
+//
+// For example, given the following counts:
+//
+//     {"a", "b"}: 1,
+//     {"a", "c"}: 3
+//     {"a", "c", "d"}: 5
+//     {"a", "c", "e"}: 7
+//
+// The following key prefixes will present the respective list results:
+//
+//          {"a"} => {{"a", "b"}, 1, false}, {{"a", "c"}, 3, false}, {{"a", "c"}, 12, true}
+//     {"a", "c"} => {{"a", "c", "d"}, 3, false}, {"a", "c", "e"}, 5, false}
+//
+func (s *Store) ListCounters(keyPrefix []string) ([]Counter, error) {
+	session := s.session.Copy()
+	defer session.Close()
+
+	tokensColl := session.StatTokens()
+	countersColl := session.StatCounters()
+
+	skey, err := s.statsKey(session, keyPrefix, false)
+	if err == ErrNotFound {
+		return nil, nil
+	}
+	if err != nil {
+		return nil, err
+	}
+	regex := "^" + skey + ".+"
+
+	// For a search key "a:b:" matching a key "a:b:c:d:e:", this map function emits "a:b:c:*".
+	// For a search key "a:b:" matching a key "a:b:c:", it emits "a:b:c:".
+	mapf := fmt.Sprintf(`
+		function() {
+		    var k = this.k;
+		    var i = k.indexOf(':', %d)+1;
+		    if (k.length > i)  { k = k.substr(0, i)+'*'; }
+		    emit(k, this.c);
+		}`, len(skey))
+	reducef := "function(key, values) { return Array.sum(values); }"
+	job := mgo.MapReduce{Map: mapf, Reduce: reducef}
+
+	var result []struct {
+		Key   string `bson:"_id"`
+		Value int64
+	}
+	_, err = countersColl.Find(bson.D{{"k", bson.D{{"$regex", regex}}}}).MapReduce(&job, &result)
+	if err != nil {
+		return nil, err
+	}
+	var counters []Counter
+	for i := range result {
+		ids := strings.Split(result[i].Key, ":")
+		tokens := make([]string, 0, len(ids))
+		for i := 0; i < len(ids)-1; i++ {
+			if ids[i] == "*" {
+				continue
+			}
+			id, err := strconv.ParseInt(ids[i], 32, 32)
+			if err != nil {
+				return nil, fmt.Errorf("store: invalid id: %q", ids[i])
+			}
+			token, found := s.statsIdToken(int(id))
+			if !found {
+				var t tokenId
+				err = tokensColl.FindId(id).One(&t)
+				if err == mgo.ErrNotFound {
+					return nil, fmt.Errorf("store: internal error; token id not found: %d", id)
+				}
+				s.cacheStatsTokenId(t.Token, t.Id)
+				token = t.Token
+			}
+			tokens = append(tokens, token)
+		}
+		counter := Counter{
+			Key:    tokens,
+			Count:  result[i].Value,
+			Prefix: len(ids) > 0 && ids[len(ids)-1] == "*",
+		}
+		counters = append(counters, counter)
+	}
+	sort.Sort(sortableCounters(counters))
+	return counters, nil
+}
+
+type sortableCounters []Counter
+
+func (s sortableCounters) Len() int      { return len(s) }
+func (s sortableCounters) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
+func (s sortableCounters) Less(i, j int) bool {
+	// Larger counts first.
+	if s[i].Count != s[j].Count {
+		return s[j].Count < s[i].Count
+	}
+	// Then smaller/shorter keys first.
+	ki := s[i].Key
+	kj := s[j].Key
+	for n := range ki {
+		if n >= len(kj) {
+			return false
+		}
+		if ki[n] != kj[n] {
+			return ki[n] < kj[n]
+		}
+	}
+	if len(ki) < len(kj) {
+		return true
+	}
+	// Then full keys first.
+	return !s[i].Prefix && s[j].Prefix
+}
+
 // A CharmPublisher is responsible for importing a charm dir onto the store.
 type CharmPublisher struct {
 	revision int

=== modified file 'store/store_test.go'
--- store/store_test.go	2013-02-28 08:11:29 +0000
+++ store/store_test.go	2013-02-28 12:30:29 +0000
@@ -464,8 +464,8 @@
 		{[]string{"a", "b", "c"}, false, 10},
 		{[]string{"a", "b"}, false, 7},
 		{[]string{"a", "z", "b"}, false, 3},
-		{[]string{"a", "b", "c"}, true, 10},
-		{[]string{"a", "b"}, true, 17},
+		{[]string{"a", "b", "c"}, true, 0},
+		{[]string{"a", "b"}, true, 10},
 		{[]string{"a"}, true, 20},
 		{[]string{"b"}, true, 0},
 	}
@@ -523,7 +523,7 @@
 	c.Assert(err, IsNil)
 	c.Assert(sum, Equals, int64(0))
 
-	const genSize = 512
+	const genSize = 1024
 
 	// All of these will be cached, as we have two generations
 	// of genSize entries each.
@@ -597,6 +597,63 @@
 	c.Assert(sum, Equals, int64(10))
 }
 
+func (s *StoreSuite) TestCounterList(c *C) {
+	incs := [][]string{
+		{"c", "b", "a"}, // Assign internal id c < id b < id a, to make sorting slightly trickier.
+		{"a"},
+		{"a", "c"},
+		{"a", "b"},
+		{"a", "b", "c"},
+		{"a", "b", "c"},
+		{"a", "b", "e"},
+		{"a", "b", "d"},
+		{"a", "f", "g"},
+		{"a", "f", "h"},
+		{"a", "i"},
+		{"a", "i", "j"},
+		{"k", "l"},
+	}
+	for _, key := range incs {
+		err := s.store.IncCounter(key)
+		c.Assert(err, IsNil)
+	}
+
+	tests := []struct {
+		prefix []string
+		result []store.Counter
+	}{
+		{
+			[]string{"a"},
+			[]store.Counter{
+				{[]string{"a", "b"}, 4, true},
+				{[]string{"a", "f"}, 2, true},
+				{[]string{"a", "b"}, 1, false},
+				{[]string{"a", "c"}, 1, false},
+				{[]string{"a", "i"}, 1, false},
+				{[]string{"a", "i"}, 1, true},
+			},
+		}, {
+			[]string{"a", "b"},
+			[]store.Counter{
+				{[]string{"a", "b", "c"}, 2, false},
+				{[]string{"a", "b", "d"}, 1, false},
+				{[]string{"a", "b", "e"}, 1, false},
+			},
+		},
+	}
+
+	// Use a different store to exercise cache filling.
+	st, err := store.Open(s.Addr)
+	c.Assert(err, IsNil)
+	defer st.Close()
+
+	for i := range tests {
+		result, err := st.ListCounters(tests[i].prefix)
+		c.Assert(err, IsNil)
+		c.Assert(result, DeepEquals, tests[i].result)
+	}
+}
+
 func (s *TrivialSuite) TestEventString(c *C) {
 	c.Assert(store.EventPublished, Matches, "published")
 	c.Assert(store.EventPublishError, Matches, "publish-error")

=== modified file 'testing/cmd.go'
--- testing/cmd.go	2013-02-28 08:11:29 +0000
+++ testing/cmd.go	2013-02-28 12:30:29 +0000
@@ -27,15 +27,38 @@
 	return c.Init(f.Args())
 }
 
+// Context creates a simple command execution context with the current
+// dir set to a newly created directory within the test directory.
+func Context(c *C) *cmd.Context {
+	return &cmd.Context{
+		Dir:    c.MkDir(),
+		Stdin:  &bytes.Buffer{},
+		Stdout: &bytes.Buffer{},
+		Stderr: &bytes.Buffer{},
+	}
+}
+
+// ContextForDir creates a simple command execution context with the current
+// dir set to the specified directory.
+func ContextForDir(c *C, dir string) *cmd.Context {
+	return &cmd.Context{
+		Dir:    dir,
+		Stdin:  &bytes.Buffer{},
+		Stdout: &bytes.Buffer{},
+		Stderr: &bytes.Buffer{},
+	}
+}
+
 // RunCommand will run a command with the specified args.  The returned error
 // may come from either the parsing of the args, the command initialisation or
 // the actual running of the command.  Access to the resulting output streams
-// is not provided with this function.
-func RunCommand(c *C, com cmd.Command, args []string) error {
+// is provided through the returned context instance.
+func RunCommand(c *C, com cmd.Command, args []string) (*cmd.Context, error) {
 	if err := InitCommand(com, args); err != nil {
-		return err
+		return nil, err
 	}
-	return com.Run(&cmd.Context{c.MkDir(), &bytes.Buffer{}, &bytes.Buffer{}, &bytes.Buffer{}})
+	var context = Context(c)
+	return context, com.Run(context)
 }
 
 // TestInit checks that a command initialises correctly with the given set of

=== modified file 'worker/uniter/jujuc/config-get_test.go'
--- worker/uniter/jujuc/config-get_test.go	2013-02-28 08:11:29 +0000
+++ worker/uniter/jujuc/config-get_test.go	2013-02-28 12:30:29 +0000
@@ -41,7 +41,7 @@
 		hctx := s.GetHookContext(c, -1, "")
 		com, err := jujuc.NewCommand(hctx, "config-get")
 		c.Assert(err, IsNil)
-		ctx := dummyContext(c)
+		ctx := testing.Context(c)
 		code := cmd.Main(com, ctx, t.args)
 		c.Assert(code, Equals, 0)
 		c.Assert(bufferString(ctx.Stderr), Equals, "")
@@ -53,7 +53,7 @@
 	hctx := s.GetHookContext(c, -1, "")
 	com, err := jujuc.NewCommand(hctx, "config-get")
 	c.Assert(err, IsNil)
-	ctx := dummyContext(c)
+	ctx := testing.Context(c)
 	code := cmd.Main(com, ctx, []string{"--help"})
 	c.Assert(code, Equals, 0)
 	c.Assert(bufferString(ctx.Stdout), Equals, "")
@@ -74,7 +74,7 @@
 	hctx := s.GetHookContext(c, -1, "")
 	com, err := jujuc.NewCommand(hctx, "config-get")
 	c.Assert(err, IsNil)
-	ctx := dummyContext(c)
+	ctx := testing.Context(c)
 	code := cmd.Main(com, ctx, []string{"--output", "some-file", "monsters"})
 	c.Assert(code, Equals, 0)
 	c.Assert(bufferString(ctx.Stderr), Equals, "")

=== modified file 'worker/uniter/jujuc/ports_test.go'
--- worker/uniter/jujuc/ports_test.go	2013-02-28 08:11:29 +0000
+++ worker/uniter/jujuc/ports_test.go	2013-02-28 12:30:29 +0000
@@ -29,7 +29,7 @@
 	for _, t := range portsTests {
 		com, err := jujuc.NewCommand(hctx, t.cmd[0])
 		c.Assert(err, IsNil)
-		ctx := dummyContext(c)
+		ctx := testing.Context(c)
 		code := cmd.Main(com, ctx, t.cmd[1:])
 		c.Assert(code, Equals, 0)
 		c.Assert(bufferString(ctx.Stdout), Equals, "")

=== modified file 'worker/uniter/jujuc/relation-get_test.go'
--- worker/uniter/jujuc/relation-get_test.go	2013-02-28 08:11:29 +0000
+++ worker/uniter/jujuc/relation-get_test.go	2013-02-28 12:30:29 +0000
@@ -5,6 +5,7 @@
 	"io/ioutil"
 	. "launchpad.net/gocheck"
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/worker/uniter/jujuc"
 	"path/filepath"
 )
@@ -165,7 +166,7 @@
 		hctx := s.GetHookContext(c, t.relid, t.unit)
 		com, err := jujuc.NewCommand(hctx, "relation-get")
 		c.Assert(err, IsNil)
-		ctx := dummyContext(c)
+		ctx := testing.Context(c)
 		code := cmd.Main(com, ctx, t.args)
 		c.Assert(code, Equals, t.code)
 		if code == 0 {
@@ -230,7 +231,7 @@
 		hctx := s.GetHookContext(c, t.relid, t.unit)
 		com, err := jujuc.NewCommand(hctx, "relation-get")
 		c.Assert(err, IsNil)
-		ctx := dummyContext(c)
+		ctx := testing.Context(c)
 		code := cmd.Main(com, ctx, []string{"--help"})
 		c.Assert(code, Equals, 0)
 		c.Assert(bufferString(ctx.Stdout), Equals, "")
@@ -247,7 +248,7 @@
 	hctx := s.GetHookContext(c, 1, "m/0")
 	com, err := jujuc.NewCommand(hctx, "relation-get")
 	c.Assert(err, IsNil)
-	ctx := dummyContext(c)
+	ctx := testing.Context(c)
 	code := cmd.Main(com, ctx, []string{"--output", "some-file", "pew"})
 	c.Assert(code, Equals, 0)
 	c.Assert(bufferString(ctx.Stderr), Equals, "")

=== modified file 'worker/uniter/jujuc/relation-ids_test.go'
--- worker/uniter/jujuc/relation-ids_test.go	2013-02-28 08:11:29 +0000
+++ worker/uniter/jujuc/relation-ids_test.go	2013-02-28 12:30:29 +0000
@@ -4,6 +4,7 @@
 	"fmt"
 	. "launchpad.net/gocheck"
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/worker/uniter/jujuc"
 )
 
@@ -101,7 +102,7 @@
 		hctx := s.GetHookContext(c, t.relid, "")
 		com, err := jujuc.NewCommand(hctx, "relation-ids")
 		c.Assert(err, IsNil)
-		ctx := dummyContext(c)
+		ctx := testing.Context(c)
 		code := cmd.Main(com, ctx, t.args)
 		c.Assert(code, Equals, t.code)
 		if code == 0 {
@@ -141,7 +142,7 @@
 		hctx := s.GetHookContext(c, relid, "")
 		com, err := jujuc.NewCommand(hctx, "relation-ids")
 		c.Assert(err, IsNil)
-		ctx := dummyContext(c)
+		ctx := testing.Context(c)
 		code := cmd.Main(com, ctx, []string{"--help"})
 		c.Assert(code, Equals, 0)
 		c.Assert(bufferString(ctx.Stdout), Equals, "")

=== modified file 'worker/uniter/jujuc/relation-list_test.go'
--- worker/uniter/jujuc/relation-list_test.go	2013-02-28 08:11:29 +0000
+++ worker/uniter/jujuc/relation-list_test.go	2013-02-28 12:30:29 +0000
@@ -4,6 +4,7 @@
 	"fmt"
 	. "launchpad.net/gocheck"
 	"launchpad.net/juju-core/cmd"
+	"launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/worker/uniter/jujuc"
 )
 
@@ -107,7 +108,7 @@
 		setMembers(hctx.rels[1], t.members1)
 		com, err := jujuc.NewCommand(hctx, "relation-list")
 		c.Assert(err, IsNil)
-		ctx := dummyContext(c)
+		ctx := testing.Context(c)
 		code := cmd.Main(com, ctx, t.args)
 		c.Logf(bufferString(ctx.Stderr))
 		c.Assert(code, Equals, t.code)
@@ -148,7 +149,7 @@
 		hctx := s.GetHookContext(c, relid, "")
 		com, err := jujuc.NewCommand(hctx, "relation-list")
 		c.Assert(err, IsNil)
-		ctx := dummyContext(c)
+		ctx := testing.Context(c)
 		code := cmd.Main(com, ctx, []string{"--help"})
 		c.Assert(code, Equals, 0)
 		c.Assert(bufferString(ctx.Stdout), Equals, "")

=== modified file 'worker/uniter/jujuc/relation-set_test.go'
--- worker/uniter/jujuc/relation-set_test.go	2013-02-28 08:11:29 +0000
+++ worker/uniter/jujuc/relation-set_test.go	2013-02-28 12:30:29 +0000
@@ -25,7 +25,7 @@
 		hctx := s.GetHookContext(c, t.relid, "")
 		com, err := jujuc.NewCommand(hctx, "relation-set")
 		c.Assert(err, IsNil)
-		ctx := dummyContext(c)
+		ctx := testing.Context(c)
 		code := cmd.Main(com, ctx, []string{"--help"})
 		c.Assert(code, Equals, 0)
 		c.Assert(bufferString(ctx.Stdout), Equals, "")
@@ -198,7 +198,7 @@
 		rset := com.(*jujuc.RelationSetCommand)
 		rset.RelationId = 1
 		rset.Settings = t.change
-		ctx := dummyContext(c)
+		ctx := testing.Context(c)
 		err = com.Run(ctx)
 		c.Assert(err, IsNil)
 

=== modified file 'worker/uniter/jujuc/server.go'
--- worker/uniter/jujuc/server.go	2013-02-28 08:11:29 +0000
+++ worker/uniter/jujuc/server.go	2013-02-28 12:30:29 +0000
@@ -91,7 +91,12 @@
 		return badReqErrorf("%s", err)
 	}
 	var stdin, stdout, stderr bytes.Buffer
-	ctx := &cmd.Context{req.Dir, &stdin, &stdout, &stderr}
+	ctx := &cmd.Context{
+		Dir:    req.Dir,
+		Stdin:  &stdin,
+		Stdout: &stdout,
+		Stderr: &stderr,
+	}
 	j.mu.Lock()
 	defer j.mu.Unlock()
 	log.Printf("worker/uniter/jujuc: running hook %q %q", req.CommandName, req.Args)

=== modified file 'worker/uniter/jujuc/unit-get_test.go'
--- worker/uniter/jujuc/unit-get_test.go	2013-02-28 08:11:29 +0000
+++ worker/uniter/jujuc/unit-get_test.go	2013-02-28 12:30:29 +0000
@@ -37,7 +37,7 @@
 func (s *UnitGetSuite) TestOutputFormat(c *C) {
 	for _, t := range unitGetTests {
 		com := s.createCommand(c)
-		ctx := dummyContext(c)
+		ctx := testing.Context(c)
 		code := cmd.Main(com, ctx, t.args)
 		c.Assert(code, Equals, 0)
 		c.Assert(bufferString(ctx.Stderr), Equals, "")
@@ -47,7 +47,7 @@
 
 func (s *UnitGetSuite) TestHelp(c *C) {
 	com := s.createCommand(c)
-	ctx := dummyContext(c)
+	ctx := testing.Context(c)
 	code := cmd.Main(com, ctx, []string{"--help"})
 	c.Assert(code, Equals, 0)
 	c.Assert(bufferString(ctx.Stdout), Equals, "")
@@ -64,7 +64,7 @@
 
 func (s *UnitGetSuite) TestOutputPath(c *C) {
 	com := s.createCommand(c)
-	ctx := dummyContext(c)
+	ctx := testing.Context(c)
 	code := cmd.Main(com, ctx, []string{"--output", "some-file", "private-address"})
 	c.Assert(code, Equals, 0)
 	c.Assert(bufferString(ctx.Stderr), Equals, "")

=== modified file 'worker/uniter/jujuc/util_test.go'
--- worker/uniter/jujuc/util_test.go	2013-02-28 08:11:29 +0000
+++ worker/uniter/jujuc/util_test.go	2013-02-28 12:30:29 +0000
@@ -5,7 +5,6 @@
 	"fmt"
 	"io"
 	. "launchpad.net/gocheck"
-	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/worker/uniter/jujuc"
 	"sort"
@@ -14,10 +13,6 @@
 
 func TestPackage(t *testing.T) { TestingT(t) }
 
-func dummyContext(c *C) *cmd.Context {
-	return &cmd.Context{c.MkDir(), nil, &bytes.Buffer{}, &bytes.Buffer{}}
-}
-
 func bufferString(w io.Writer) string {
 	return w.(*bytes.Buffer).String()
 }