Merge into trunk : 054-env-more-script-friendly : Code : juju-core

Reviewer	Review Type	Date Requested	Status
Juju Engineering		2013-10-18	Pending
Review via email: mp+191838@code.launchpad.net

Revision history for this message

Frank Mueller (themue) wrote on 2013-10-18:

#

Download full text (8.3 KiB)

Reviewers: mp+191838_code.launchpad.net,

Message:
Please take a look.

Description:
switch: more script friendly output

Changed switch command to more script friendly
output. Branch has been newly created after an
error when reverting.

https://code.launchpad.net/~themue/juju-core/054-env-more-script-friendly/+merge/191838

(do not edit description out of merge proposal)

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

Affected files (+46, -42 lines):
   A [revision details]
   M cmd/juju/switch.go
   M cmd/juju/switch_test.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20131018031007-g87i6t5sgxtr7gxl
+New revision: <email address hidden>

Index: cmd/juju/switch.go
=== modified file 'cmd/juju/switch.go'
--- cmd/juju/switch.go 2013-10-08 14:53:20 +0000
+++ cmd/juju/switch.go 2013-10-18 16:43:45 +0000
@@ -19,6 +19,7 @@
   cmd.CommandBase
   EnvName string
   List bool
+ Raw bool
  }

  var switchDoc = `
@@ -69,17 +70,17 @@
   jujuEnv := os.Getenv("JUJU_ENV")
   if jujuEnv != "" {
    if c.EnvName == "" {
- fmt.Fprintf(ctx.Stdout, "Current environment: %q (from JUJU_ENV)\n",
jujuEnv)
+ fmt.Fprintf(ctx.Stdout, "%s\n", jujuEnv)
     return nil
    } else {
- return fmt.Errorf("Cannot switch when JUJU_ENV is overriding the
environment (set to %q)", jujuEnv)
+ return fmt.Errorf("cannot switch when JUJU_ENV is overriding the
environment (set to %q)", jujuEnv)
    }
   }

   // Passing through the empty string reads the default environments.yaml
file.
   environments, err := environs.ReadEnvirons("")
   if err != nil {
- return errors.New("couldn't read the environment.")
+ return errors.New("couldn't read the environment")
   }
   names := environments.Names()
   sort.Strings(names)
@@ -89,32 +90,39 @@
    currentEnv = environments.Default
   }

- // In order to have only a set environment name quoted, make a small
function
- env := func() string {
- if currentEnv == "" {
- return "<not specified>"
- }
- return fmt.Sprintf("%q", currentEnv)
- }
-
- if c.EnvName == "" || c.EnvName == currentEnv {
- fmt.Fprintf(ctx.Stdout, "Current environment: %s\n", env())
- } else {
- // Check to make sure that the specified environment
+ // Handle the different operation modes.
+ switch {
+ case c.List:
+ // List all environments.
+ if c.EnvName != "" {
+ return errors.New("cannot switch and list at the same time")
+ }
+ for _, name := range names {
+ if name == currentEnv {
+ fmt.Fprintf(ctx.Stdout, "%s (*)\n", name)
+ } else {
+ fmt.Fprintf(ctx.Stdout, "%s\n", name)
+ }
+ }
+ case c.EnvName == "" && currentEnv == "":
+ // Nothing specified and nothing to switch to.
+ return errors.New("no currently specified environment")
+ case c.EnvName == "":
+ // Simply print the current environment.
+ fmt.Fprintf(ctx.Stdout, "%s\n", currentEnv)
+ default:
+ // Switch the environment.
if !validEnvironmentName(c.EnvName, names) {
return fmt.Errorf("%q is not a name of an existing defined
environment",...

Reviewers: mp+191838_code.launchpad.net,

Message:
Please take a look.

Description:
switch: more script friendly output

Changed switch command to more script friendly
output. Branch has been newly created after an
error when reverting.

https://code.launchpad.net/~themue/juju-core/054-env-more-script-friendly/+merge/191838

(do not edit description out of merge proposal)

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

Affected files (+46, -42 lines):
   A [revision details]
   M cmd/juju/switch.go
   M cmd/juju/switch_test.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details]	2012-01-01 00:00:00 +0000
+++ [revision details]	2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20131018031007-g87i6t5sgxtr7gxl
+New revision: frank.mueller@canonical.com-20131018164345-yx7n7z7xoz5662bx

Index: cmd/juju/switch.go
=== modified file 'cmd/juju/switch.go'
--- cmd/juju/switch.go	2013-10-08 14:53:20 +0000
+++ cmd/juju/switch.go	2013-10-18 16:43:45 +0000
@@ -19,6 +19,7 @@
  	cmd.CommandBase
  	EnvName string
  	List    bool
+	Raw     bool
  }

var switchDoc = `
@@ -69,17 +70,17 @@
  	jujuEnv := os.Getenv("JUJU_ENV")
  	if jujuEnv != "" {
  		if c.EnvName == "" {
-			fmt.Fprintf(ctx.Stdout, "Current environment: %q (from JUJU_ENV)\n",  
jujuEnv)
+			fmt.Fprintf(ctx.Stdout, "%s\n", jujuEnv)
  			return nil
  		} else {
-			return fmt.Errorf("Cannot switch when JUJU_ENV is overriding the  
environment (set to %q)", jujuEnv)
+			return fmt.Errorf("cannot switch when JUJU_ENV is overriding the  
environment (set to %q)", jujuEnv)
  		}
  	}

// Passing through the empty string reads the default environments.yaml  
file.
  	environments, err := environs.ReadEnvirons("")
  	if err != nil {
-		return errors.New("couldn't read the environment.")
+		return errors.New("couldn't read the environment")
  	}
  	names := environments.Names()
  	sort.Strings(names)
@@ -89,32 +90,39 @@
  		currentEnv = environments.Default
  	}

-	// In order to have only a set environment name quoted, make a small  
function
-	env := func() string {
-		if currentEnv == "" {
-			return "<not specified>"
-		}
-		return fmt.Sprintf("%q", currentEnv)
-	}
-
-	if c.EnvName == "" || c.EnvName == currentEnv {
-		fmt.Fprintf(ctx.Stdout, "Current environment: %s\n", env())
-	} else {
-		// Check to make sure that the specified environment
+	// Handle the different operation modes.
+	switch {
+	case c.List:
+		// List all environments.
+		if c.EnvName != "" {
+			return errors.New("cannot switch and list at the same time")
+		}
+		for _, name := range names {
+			if name == currentEnv {
+				fmt.Fprintf(ctx.Stdout, "%s (*)\n", name)
+			} else {
+				fmt.Fprintf(ctx.Stdout, "%s\n", name)
+			}
+		}
+	case c.EnvName == "" && currentEnv == "":
+		// Nothing specified and nothing to switch to.
+		return errors.New("no currently specified environment")
+	case c.EnvName == "":
+		// Simply print the current environment.
+		fmt.Fprintf(ctx.Stdout, "%s\n", currentEnv)
+	default:
+		// Switch the environment.
  		if !validEnvironmentName(c.EnvName, names) {
  			return fmt.Errorf("%q is not a name of an existing defined  
environment", c.EnvName)
  		}
  		if err := cmd.WriteCurrentEnvironment(c.EnvName); err != nil {
  			return err
  		}
-		fmt.Fprintf(ctx.Stdout, "Changed default environment from %s to %q\n",  
env(), c.EnvName)
-	}
-	if c.List {
-		fmt.Fprintf(ctx.Stdout, "\nEnvironments:\n")
-		for _, name := range names {
-			fmt.Fprintf(ctx.Stdout, "\t%s\n", name)
+		if currentEnv == "" {
+			fmt.Fprintf(ctx.Stdout, "-> %s\n", c.EnvName)
+		} else {
+			fmt.Fprintf(ctx.Stdout, "%s -> %s\n", currentEnv, c.EnvName)
  		}
  	}
-
  	return nil
  }

Index: cmd/juju/switch_test.go
=== modified file 'cmd/juju/switch_test.go'
--- cmd/juju/switch_test.go	2013-09-13 14:48:13 +0000
+++ cmd/juju/switch_test.go	2013-10-18 16:43:45 +0000
@@ -21,21 +21,20 @@
  func (*SwitchSimpleSuite) TestNoEnvironment(c *gc.C) {
  	defer testing.MakeEmptyFakeHome(c).Restore()
  	_, err := testing.RunCommand(c, &SwitchCommand{}, nil)
-	c.Assert(err, gc.ErrorMatches, "couldn't read the environment.")
+	c.Assert(err, gc.ErrorMatches, "couldn't read the environment")
  }

func (*SwitchSimpleSuite) TestNoDefault(c *gc.C) {
  	defer testing.MakeFakeHome(c,  
testing.MultipleEnvConfigNoDefault).Restore()
-	context, err := testing.RunCommand(c, &SwitchCommand{}, nil)
-	c.Assert(err, gc.IsNil)
-	c.Assert(testing.Stdout(context), gc.Equals, "Current environment: <not  
specified>\n")
+	_, err := testing.RunCommand(c, &SwitchCommand{}, nil)
+	c.Assert(err, gc.ErrorMatches, "no currently specified environment")
  }

func (*SwitchSimpleSuite) TestShowsDefault(c *gc.C) {
  	defer testing.MakeFakeHome(c, testing.MultipleEnvConfig).Restore()
  	context, err := testing.RunCommand(c, &SwitchCommand{}, nil)
  	c.Assert(err, gc.IsNil)
-	c.Assert(testing.Stdout(context), gc.Equals, "Current environment:  
\"erewhemos\"\n")
+	c.Assert(testing.Stdout(context), gc.Equals, "erewhemos\n")
  }

func (*SwitchSimpleSuite) TestCurrentEnvironmentHasPrecidence(c *gc.C) {
@@ -44,7 +43,7 @@
  	home.AddFiles(c,  
[]testing.TestFile{{".juju/current-environment", "fubar"}})
  	context, err := testing.RunCommand(c, &SwitchCommand{}, nil)
  	c.Assert(err, gc.IsNil)
-	c.Assert(testing.Stdout(context), gc.Equals, "Current environment:  
\"fubar\"\n")
+	c.Assert(testing.Stdout(context), gc.Equals, "fubar\n")
  }

func (*SwitchSimpleSuite) TestShowsJujuEnv(c *gc.C) {
@@ -52,7 +51,7 @@
  	os.Setenv("JUJU_ENV", "using-env")
  	context, err := testing.RunCommand(c, &SwitchCommand{}, nil)
  	c.Assert(err, gc.IsNil)
-	c.Assert(testing.Stdout(context), gc.Equals, "Current environment:  
\"using-env\" (from JUJU_ENV)\n")
+	c.Assert(testing.Stdout(context), gc.Equals, "using-env\n")
  }

func (*SwitchSimpleSuite) TestJujuEnvOverCurrentEnvironment(c *gc.C) {
@@ -62,14 +61,14 @@
  	os.Setenv("JUJU_ENV", "using-env")
  	context, err := testing.RunCommand(c, &SwitchCommand{}, nil)
  	c.Assert(err, gc.IsNil)
-	c.Assert(testing.Stdout(context), gc.Equals, "Current environment:  
\"using-env\" (from JUJU_ENV)\n")
+	c.Assert(testing.Stdout(context), gc.Equals, "using-env\n")
  }

func (*SwitchSimpleSuite) TestSettingWritesFile(c *gc.C) {
  	defer testing.MakeFakeHome(c, testing.MultipleEnvConfig).Restore()
  	context, err := testing.RunCommand(c, &SwitchCommand{},  
[]string{"erewhemos-2"})
  	c.Assert(err, gc.IsNil)
-	c.Assert(testing.Stdout(context), gc.Equals, "Changed default environment  
from \"erewhemos\" to \"erewhemos-2\"\n")
+	c.Assert(testing.Stdout(context), gc.Equals, "erewhemos -> erewhemos-2\n")
  	c.Assert(cmd.ReadCurrentEnvironment(), gc.Equals, "erewhemos-2")
  }

@@ -83,29 +82,24 @@
  	defer testing.MakeFakeHome(c, testing.MultipleEnvConfig).Restore()
  	os.Setenv("JUJU_ENV", "using-env")
  	_, err := testing.RunCommand(c, &SwitchCommand{}, []string{"erewhemos-2"})
-	c.Assert(err, gc.ErrorMatches, `Cannot switch when JUJU_ENV is overriding  
the environment $set to "using-env"$`)
+	c.Assert(err, gc.ErrorMatches, `cannot switch when JUJU_ENV is overriding  
the environment $set to "using-env"$`)
  }

-const expectedEnvironments = `
-Environments:
-	erewhemos
-	erewhemos-2
+const expectedEnvironments = `erewhemos (*)
+erewhemos-2
  `

func (*SwitchSimpleSuite) TestListEnvironments(c *gc.C) {
  	defer testing.MakeFakeHome(c, testing.MultipleEnvConfig).Restore()
  	context, err := testing.RunCommand(c, &SwitchCommand{},  
[]string{"--list"})
  	c.Assert(err, gc.IsNil)
-	c.Assert(testing.Stdout(context), gc.Matches, "Current environment:  
\"erewhemos\"(.|\n)*")
-	c.Assert(testing.Stdout(context), gc.Matches, "(.| 
\n)*"+expectedEnvironments)
+	c.Assert(testing.Stdout(context), gc.Equals, expectedEnvironments)
  }

func (*SwitchSimpleSuite) TestListEnvironmentsAndChange(c *gc.C) {
  	defer testing.MakeFakeHome(c, testing.MultipleEnvConfig).Restore()
-	context, err := testing.RunCommand(c, &SwitchCommand{},  
[]string{"--list", "erewhemos-2"})
-	c.Assert(err, gc.IsNil)
-	c.Assert(testing.Stdout(context), gc.Matches, "Changed default  
environment from \"erewhemos\" to \"erewhemos-2\"(.|\n)*")
-	c.Assert(testing.Stdout(context), gc.Matches, "(.| 
\n)*"+expectedEnvironments)
+	_, err := testing.RunCommand(c, &SwitchCommand{},  
[]string{"--list", "erewhemos-2"})
+	c.Assert(err, gc.ErrorMatches, "cannot switch and list at the same time")
  }

func (*SwitchSimpleSuite) TestTooManyParams(c *gc.C) {

Revision history for this message

Martin Packman (gz) wrote on 2013-10-18:

#

Code looks fine apart from one possibly spurious struct member addition.

I have mixed feelings about making switch less user friendly and more
script friendly. It feels mostly like a user-only command to me, unlike
status say. In bzr it's similar, status gives output that's quite
machine parsable, but switch is an interactive command. In the bug, stub
doesn't really go into *why* he wants to script this, my instinct would
be to say using seperate juju homes would be more suitable than having
one and switching.

https://codereview.appspot.com/15080044/diff/1/cmd/juju/switch.go
File cmd/juju/switch.go (right):

https://codereview.appspot.com/15080044/diff/1/cmd/juju/switch.go#newcode22
cmd/juju/switch.go:22: Raw bool
What's this used for?

https://codereview.appspot.com/15080044/

Revision history for this message

Frank Mueller (themue) wrote on 2013-10-18:

#

On 2013/10/18 17:41:49, gz wrote:
> Code looks fine apart from one possibly spurious struct member
addition.

> I have mixed feelings about making switch less user friendly and more
script
> friendly. It feels mostly like a user-only command to me, unlike
status say. In
> bzr it's similar, status gives output that's quite machine parsable,
but switch
> is an interactive command. In the bug, stub doesn't really go into
*why* he
> wants to script this, my instinct would be to say using seperate juju
homes
> would be more suitable than having one and switching.

> https://codereview.appspot.com/15080044/diff/1/cmd/juju/switch.go
> File cmd/juju/switch.go (right):

https://codereview.appspot.com/15080044/diff/1/cmd/juju/switch.go#newcode22
> cmd/juju/switch.go:22: Raw bool
> What's this used for?

Ooops, the raw has indeed to be removed, it's a leftover of a former
try.

The discussion about the output has gone through several circles, with
--raw and raw as default. This is the agreement after the discussion.

The problem is that this command is overloaded. It gets, sets and lists
for the user and for scripts.

https://codereview.appspot.com/15080044/

Revision history for this message

Roger Peppe (rogpeppe) wrote on 2013-11-12:

#

LGTM with one thought below.

Personally I think that the script friendly output is also user friendly
- verbosity does not necessarily imply friendliness.

Also many people write ad-hoc scripts on the command line - it's good to
be an upstanding command line citizen and play nicely with the shell
IMHO.

https://codereview.appspot.com/15080044/diff/1/cmd/juju/switch.go
File cmd/juju/switch.go (right):

https://codereview.appspot.com/15080044/diff/1/cmd/juju/switch.go#newcode102
cmd/juju/switch.go:102: fmt.Fprintf(ctx.Stdout, "%s (*)\n", name)
I'm not sure it's worth showing this.
It means that this won't work, for example:

for i in `juju switch -l`; do
juju status -e $i
done

I'm not sure we need to combine the two
functionalities (list environments and print
current environment name). Let's keep it as
simple as possible.

YMMV though.

https://codereview.appspot.com/15080044/

Revision history for this message

William Reade (fwereade) wrote on 2013-11-18:

#

This looks like a perfect situation for a --format param and some
structs, and leaving the existing output unchanged as the "smart" (haha)
option. What led us do do it otherwise?

https://codereview.appspot.com/15080044/

Revision history for this message

Frank Mueller (themue) wrote on 2013-11-18:

#

On 2013/11/18 10:46:13, william.reade wrote:
> This looks like a perfect situation for a --format param and some
structs, and
> leaving the existing output unchanged as the "smart" (haha) option.
What led us
> do do it otherwise?

There has been a first approach:
https://code.launchpad.net/~themue/juju-core/053-env-more-script-friendly

The reviews and the discussion for it led to a second approach.
Different people have different preferences. I'll talk to Stuart about
his preferences, he "owns" the issue.

https://codereview.appspot.com/15080044/

Revision history for this message

Roger Peppe (rogpeppe) wrote on 2013-11-18:

#

On 18 November 2013 10:46, <email address hidden> wrote:
> This looks like a perfect situation for a --format param and some
> structs, and leaving the existing output unchanged as the "smart" (haha)
> option. What led us do do it otherwise?

This was a very new command.

I thought that changing it now would result in cleaner
code and a somewhat slicker interface with minimal
compatibility issues. I don't think the verbose
output adds any particular value.

This was all discussed quite a while ago.

Revision history for this message

William Reade (fwereade) wrote on 2013-11-18:

#

On 2013/11/18 14:05:05, rog wrote:
> On 18 November 2013 10:46, <mailto:<email address hidden>>
wrote:
> > This looks like a perfect situation for a --format param and some
> > structs, and leaving the existing output unchanged as the "smart"
(haha)
> > option. What led us do do it otherwise?

> This was a very new command.

> I thought that changing it now would result in cleaner
> code and a somewhat slicker interface with minimal
> compatibility issues. I don't think the verbose
> output adds any particular value.

> This was all discussed quite a while ago.

Fair enough, I guess I just missed that one. Thanks for the history. I'm
+1 on your drop-the-(*) suggestion FWIW.

https://codereview.appspot.com/15080044/

Revision history for this message

Frank Mueller (themue) wrote on 2013-11-18:

#

On 2013/11/18 14:16:40, william.reade wrote:
> On 2013/11/18 14:05:05, rog wrote:
> > On 18 November 2013 10:46, <mailto:<email address hidden>>
wrote:
> > > This looks like a perfect situation for a --format param and some
> > > structs, and leaving the existing output unchanged as the "smart"
(haha)
> > > option. What led us do do it otherwise?
> >
> > This was a very new command.
> >
> > I thought that changing it now would result in cleaner
> > code and a somewhat slicker interface with minimal
> > compatibility issues. I don't think the verbose
> > output adds any particular value.
> >
> > This was all discussed quite a while ago.

> Fair enough, I guess I just missed that one. Thanks for the history.
I'm +1 on
> your drop-the-(*) suggestion FWIW.

Fine, then I'll do it that way.

https://codereview.appspot.com/15080044/

Revision history for this message

Frank Mueller (themue) wrote on 2013-11-18:

#

https://codereview.appspot.com/15080044/diff/1/cmd/juju/switch.go
File cmd/juju/switch.go (right):

https://codereview.appspot.com/15080044/diff/1/cmd/juju/switch.go#newcode22
cmd/juju/switch.go:22: Raw bool
On 2013/10/18 17:41:49, gz wrote:
> What's this used for?

Ouch, old approach, missed to remove it. Thx.

https://codereview.appspot.com/15080044/diff/1/cmd/juju/switch.go#newcode102
cmd/juju/switch.go:102: fmt.Fprintf(ctx.Stdout, "%s (*)\n", name)
On 2013/11/12 16:11:27, rog wrote:
> I'm not sure it's worth showing this.
> It means that this won't work, for example:

> for i in `juju switch -l`; do
> juju status -e $i
> done

> I'm not sure we need to combine the two
> functionalities (list environments and print
> current environment name). Let's keep it as
> simple as possible.

> YMMV though.

Done.

https://codereview.appspot.com/15080044/

Revision history for this message

Frank Mueller (themue) wrote on 2013-11-18:

#

Please take a look.

https://codereview.appspot.com/15080044/

Revision history for this message

Go Bot (go-bot) wrote on 2013-11-18:

#

Download full text (15.0 KiB)

The attempt to merge lp:~themue/juju-core/054-env-more-script-friendly into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core/agent 1.521s
ok launchpad.net/juju-core/agent/tools 0.270s
ok launchpad.net/juju-core/bzr 8.805s
ok launchpad.net/juju-core/cert 3.316s
ok launchpad.net/juju-core/charm 0.647s
? launchpad.net/juju-core/charm/hooks [no test files]
ok launchpad.net/juju-core/cloudinit 0.027s
ok launchpad.net/juju-core/cmd 0.240s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/juju 201.884s
ok launchpad.net/juju-core/cmd/jujud 61.343s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 2.785s
ok launchpad.net/juju-core/constraints 0.027s
ok launchpad.net/juju-core/container 0.035s
ok launchpad.net/juju-core/container/kvm 0.047s
ok launchpad.net/juju-core/container/kvm/mock 0.755s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 0.322s
? launchpad.net/juju-core/container/lxc/mock [no test files]
? launchpad.net/juju-core/container/lxc/testing [no test files]
ok launchpad.net/juju-core/downloader 5.338s
ok launchpad.net/juju-core/environs 2.976s
ok launchpad.net/juju-core/environs/bootstrap 5.072s
ok launchpad.net/juju-core/environs/cloudinit 0.519s
ok launchpad.net/juju-core/environs/config 1.402s
ok launchpad.net/juju-core/environs/configstore 0.176s
ok launchpad.net/juju-core/environs/filestorage 0.031s
ok launchpad.net/juju-core/environs/httpstorage 0.921s
ok launchpad.net/juju-core/environs/imagemetadata 0.584s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.053s
ok launchpad.net/juju-core/environs/jujutest 0.316s
ok launchpad.net/juju-core/environs/manual 7.958s
ok launchpad.net/juju-core/environs/simplestreams 0.405s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 1.243s
ok launchpad.net/juju-core/environs/storage 1.122s
ok launchpad.net/juju-core/environs/sync 31.112s
ok launchpad.net/juju-core/environs/testing 0.192s
ok launchpad.net/juju-core/environs/tools 7.337s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/errors 0.016s
ok launchpad.net/juju-core/instance 0.023s
? launchpad.net/juju-core/instance/testing [no test files]

----------------------------------------------------------------------
FAIL: apiconn_test.go:0: DeployLocalSuite.TearDownTest

Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for s...

The attempt to merge lp:~themue/juju-core/054-env-more-script-friendly into lp:juju-core failed. Below is the output from the failed tests.

ok  	launchpad.net/juju-core/agent	1.521s
ok  	launchpad.net/juju-core/agent/tools	0.270s
ok  	launchpad.net/juju-core/bzr	8.805s
ok  	launchpad.net/juju-core/cert	3.316s
ok  	launchpad.net/juju-core/charm	0.647s
?   	launchpad.net/juju-core/charm/hooks	[no test files]
ok  	launchpad.net/juju-core/cloudinit	0.027s
ok  	launchpad.net/juju-core/cmd	0.240s
?   	launchpad.net/juju-core/cmd/charmd	[no test files]
?   	launchpad.net/juju-core/cmd/charmload	[no test files]
ok  	launchpad.net/juju-core/cmd/juju	201.884s
ok  	launchpad.net/juju-core/cmd/jujud	61.343s
ok  	launchpad.net/juju-core/cmd/plugins/juju-metadata	2.785s
ok  	launchpad.net/juju-core/constraints	0.027s
ok  	launchpad.net/juju-core/container	0.035s
ok  	launchpad.net/juju-core/container/kvm	0.047s
ok  	launchpad.net/juju-core/container/kvm/mock	0.755s
?   	launchpad.net/juju-core/container/kvm/testing	[no test files]
ok  	launchpad.net/juju-core/container/lxc	0.322s
?   	launchpad.net/juju-core/container/lxc/mock	[no test files]
?   	launchpad.net/juju-core/container/lxc/testing	[no test files]
ok  	launchpad.net/juju-core/downloader	5.338s
ok  	launchpad.net/juju-core/environs	2.976s
ok  	launchpad.net/juju-core/environs/bootstrap	5.072s
ok  	launchpad.net/juju-core/environs/cloudinit	0.519s
ok  	launchpad.net/juju-core/environs/config	1.402s
ok  	launchpad.net/juju-core/environs/configstore	0.176s
ok  	launchpad.net/juju-core/environs/filestorage	0.031s
ok  	launchpad.net/juju-core/environs/httpstorage	0.921s
ok  	launchpad.net/juju-core/environs/imagemetadata	0.584s
?   	launchpad.net/juju-core/environs/imagemetadata/testing	[no test files]
ok  	launchpad.net/juju-core/environs/instances	0.053s
ok  	launchpad.net/juju-core/environs/jujutest	0.316s
ok  	launchpad.net/juju-core/environs/manual	7.958s
ok  	launchpad.net/juju-core/environs/simplestreams	0.405s
?   	launchpad.net/juju-core/environs/simplestreams/testing	[no test files]
ok  	launchpad.net/juju-core/environs/sshstorage	1.243s
ok  	launchpad.net/juju-core/environs/storage	1.122s
ok  	launchpad.net/juju-core/environs/sync	31.112s
ok  	launchpad.net/juju-core/environs/testing	0.192s
ok  	launchpad.net/juju-core/environs/tools	7.337s
?   	launchpad.net/juju-core/environs/tools/testing	[no test files]
ok  	launchpad.net/juju-core/errors	0.016s
ok  	launchpad.net/juju-core/instance	0.023s
?   	launchpad.net/juju-core/instance/testing	[no test files]

----------------------------------------------------------------------
FAIL: apiconn_test.go:0: DeployLocalSuite.TearDownTest

Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
/home/tarmac/trees/src/launchpad.net/juju-core/testing/mgo.go:333:
    c.Fatal("Test left sockets in a dirty state")
... Error: Test left sockets in a dirty state

----------------------------------------------------------------------
PANIC: conn_test.go:468: DeployLocalSuite.TestDeploySettingsError

[LOG] 92.87852 DEBUG juju.environs.configstore Making /tmp/gocheck-3209308858241334655/14/home/ubuntu/.juju/environments
[LOG] 92.96569 DEBUG juju.environs.tools reading v1.* tools
[LOG] 92.96572 INFO juju environs/testing: uploading FAKE tools 1.17.0-precise-amd64
[LOG] 92.97548 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 92.97550 DEBUG juju.environs.tools no series specified when finding tools, looking for any
[LOG] 92.97559 DEBUG juju.environs.simplestreams fetchData failed for "http://127.0.0.1:48141/dummyenv/private/tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not found
[LOG] 92.97563 DEBUG juju.environs.simplestreams cannot load index "http://127.0.0.1:48141/dummyenv/private/tools/streams/v1/index.sjson": invalid URL "http://127.0.0.1:48141/dummyenv/private/tools/streams/v1/index.sjson" not found
[LOG] 92.97568 DEBUG juju.environs.simplestreams fetchData failed for "http://127.0.0.1:48141/dummyenv/private/tools/streams/v1/index.json": file "tools/streams/v1/index.json" not found not found
[LOG] 92.97570 DEBUG juju.environs.simplestreams cannot load index "http://127.0.0.1:48141/dummyenv/private/tools/streams/v1/index.json": invalid URL "http://127.0.0.1:48141/dummyenv/private/tools/streams/v1/index.json" not found
[LOG] 92.97608 INFO juju.environs.tools Writing tools/streams/v1/index.json
[LOG] 92.97620 INFO juju.environs.tools Writing tools/streams/v1/com.ubuntu.juju:released:tools.json
[LOG] 92.97624 INFO juju.environs.bootstrap bootstrapping environment "dummyenv"
[LOG] 92.97629 DEBUG juju.environs.bootstrap looking for bootstrap tools: series="precise", arch=<nil>, version=1.17.0
[LOG] 92.97629 INFO juju.environs.tools reading tools with major.minor version 1.17
[LOG] 92.97630 INFO juju.environs.tools filtering tools by version: 1.17.0
[LOG] 92.97631 INFO juju.environs.tools filtering tools by series: precise
[LOG] 92.97633 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 92.97637 DEBUG juju.environs.simplestreams fetchData failed for "http://127.0.0.1:48141/dummyenv/private/tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not found
[LOG] 92.97639 DEBUG juju.environs.simplestreams cannot load index "http://127.0.0.1:48141/dummyenv/private/tools/streams/v1/index.sjson": invalid URL "http://127.0.0.1:48141/dummyenv/private/tools/streams/v1/index.sjson" not found
[LOG] 92.97650 DEBUG juju.environs.simplestreams fetchData failed for "http://127.0.0.1:48141/dummyenv/private/tools/streams/v1/mirrors.json": file "tools/streams/v1/mirrors.json" not found not found
[LOG] 92.97655 DEBUG juju.environs.simplestreams no mirror index file found
[LOG] 92.97657 DEBUG juju.environs.simplestreams no mirror information available for { }: mirror data for "com.ubuntu.juju:released:tools" not found
[LOG] 92.97659 DEBUG juju.environs.simplestreams read metadata index at "http://127.0.0.1:48141/dummyenv/private/tools/streams/v1/index.json"
[LOG] 92.97665 DEBUG juju.environs.simplestreams candidate matches for products ["com.ubuntu.juju:12.04:amd64" "com.ubuntu.juju:12.04:i386" "com.ubuntu.juju:12.04:arm"] are [{Mon, 18 Nov 2013 17:21:54 +0000 products:1.0 content-download  [] streams/v1/com.ubuntu.juju:released:tools.json [com.ubuntu.juju:12.04:amd64]}]
[LOG] 92.97667 DEBUG juju.environs.simplestreams finding products at path "streams/v1/com.ubuntu.juju:released:tools.json"
[LOG] 92.97688 DEBUG juju.environs.simplestreams metadata: &{map[com.ubuntu.juju:12.04:amd64:{ 1.17.0 amd64   map[20131118:0xc200de9a80]}] map[] Mon, 18 Nov 2013 17:21:54 +0000 products:1.0}
[LOG] 92.97694 INFO juju.environs.bootstrap picked newest version: 1.17.0
[LOG] 92.97697 INFO juju.provider.dummy would pick tools from 1.17.0-precise-amd64
[LOG] 93.01213 INFO juju.state opening state; mongo addresses: ["localhost:58722"]; entity ""
[LOG] 93.01492 INFO juju.state connection established
[LOG] 93.07149 INFO juju.state initializing environment
[LOG] 93.09400 INFO juju.state.apiserver listening on "127.0.0.1:37882"
[LOG] 93.11150 INFO juju.state opening state; mongo addresses: ["localhost:58722"]; entity ""
[LOG] 93.11407 INFO juju.state connection established
[LOG] 93.12699 INFO juju juju: authorization error while connecting to state server; retrying
[LOG] 93.12718 INFO juju.state opening state; mongo addresses: ["localhost:58722"]; entity ""
[LOG] 93.13238 INFO juju.state connection established
[LOG] 93.19040 INFO juju state/api: dialing "wss://127.0.0.1:37882/"
[LOG] 93.20337 INFO juju state/api: connection established
[LOG] 93.20357 DEBUG juju.state.apiserver <- [D] <unknown> {"RequestId":1,"Type":"Admin","Request":"Login","Params":{"AuthTag":"user-admin","Password":"dummy-secret","Nonce":""}}
[LOG] 93.20413 DEBUG juju.state.apiserver -> [D] user-admin 565.124us {"RequestId":1,"Response":{}} Admin[""].Login
[LOG] 93.23996 DEBUG juju.state.apiserver <- [D] user-admin {"RequestId":2,"Type":"Client","Request":"EnvironmentGet","Params":{}}
[LOG] 93.24107 DEBUG juju.state.apiserver -> [D] user-admin 1.071937ms {"RequestId":2,"Response":{"Config":{"admin-secret":"","agent-version":"1.17.0","api-port":4321,"authorized-keys":"my-keys","broken":"","ca-cert":"-----BEGIN CERTIFICATE-----\nMIIB4jCCAY6gAwIBAgIBADALBgkqhkiG9w0BAQUwSjENMAsGA1UEChMEanVqdTE5\nMDcGA1UEAwwwanVqdS1nZW5lcmF0ZWQgQ0EgZm9yIGVudmlyb25tZW50ICJqdWp1\nIHRlc3RpbmciMB4XDTEzMTExODE3MTYzNFoXDTIzMTExODE3MjEzNFowSjENMAsG\nA1UEChMEanVqdTE5MDcGA1UEAwwwanVqdS1nZW5lcmF0ZWQgQ0EgZm9yIGVudmly\nb25tZW50ICJqdWp1IHRlc3RpbmciMFowCwYJKoZIhvcNAQEBA0sAMEgCQQC3PNDH\nt2JP5geE7rt+emEKXqi/qmzm7Nt90q+Xo42TBaoPYMGaiZdocgPW0Ol1yugc6xTs\nCJDqRkjrIZ9GlrBjAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIApDAPBgNVHRMBAf8E\nBTADAQH/MB0GA1UdDgQWBBT2pjICKKV+4lVffOHUg1bdasIhBTAfBgNVHSMEGDAW\ngBT2pjICKKV+4lVffOHUg1bdasIhBTALBgkqhkiG9w0BAQUDQQAmCQMMAGC4deDR\nRrA/jRgLRqzwLF0xv9nHbPLvIXp1UP4UxM9VkX3PCsyYOZObStjlf7uKHMeNTlir\nCjGhvPXZ\n-----END CERTIFICATE-----\n","ca-private-key":"","default-series":"precise","development":false,"firewall-mode":"instance","image-metadata-url":"","logging-config":"\u003croot\u003e=WARNING;juju=DEBUG","name":"dummyenv","secret":"pork","ssl-hostname-verification":true,"state-id":"28","state-port":1234,"state-server":true,"tools-metadata-url":"","tools-url":"","type":"dummy"}}} Client[""].EnvironmentGet
[LOG] 93.25844 INFO juju writing charm to storage [1418 bytes]
[LOG] 93.25855 INFO juju adding charm to state
[LOG] 93.26151 INFO juju.provider.dummy reset environment
[LOG] 93.26563 INFO juju MgoReset successfully reset admin password
[LOG] 93.27125 INFO juju MgoReset successfully reset admin password
[LOG] 93.27454 INFO juju MgoReset successfully reset admin password
... Panic: Fixture has panicked (see related PANIC)
OOPS: 35 passed, 1 FAILED, 2 MISSED
--- FAIL: Test (29.87 seconds)
FAIL
FAIL	launchpad.net/juju-core/juju	30.078s
ok  	launchpad.net/juju-core/juju/osenv	0.018s
?   	launchpad.net/juju-core/juju/testing	[no test files]
ok  	launchpad.net/juju-core/log	0.015s
ok  	launchpad.net/juju-core/log/syslog	0.022s
ok  	launchpad.net/juju-core/names	0.027s
?   	launchpad.net/juju-core/provider	[no test files]
?   	launchpad.net/juju-core/provider/all	[no test files]
ok  	launchpad.net/juju-core/provider/azure	6.593s
ok  	launchpad.net/juju-core/provider/common	0.741s
ok  	launchpad.net/juju-core/provider/dummy	22.181s
ok  	launchpad.net/juju-core/provider/ec2	5.247s
ok  	launchpad.net/juju-core/provider/ec2/httpstorage	0.213s
ok  	launchpad.net/juju-core/provider/local	2.250s
ok  	launchpad.net/juju-core/provider/maas	10.191s
ok  	launchpad.net/juju-core/provider/null	1.284s
ok  	launchpad.net/juju-core/provider/openstack	11.758s
ok  	launchpad.net/juju-core/rpc	0.081s
ok  	launchpad.net/juju-core/rpc/jsoncodec	0.028s
?   	launchpad.net/juju-core/rpc/rpcreflect	[no test files]
ok  	launchpad.net/juju-core/schema	0.020s
ok  	launchpad.net/juju-core/state	101.276s
ok  	launchpad.net/juju-core/state/api	1.641s
ok  	launchpad.net/juju-core/state/api/agent	2.446s
?   	launchpad.net/juju-core/state/api/common	[no test files]
ok  	launchpad.net/juju-core/state/api/deployer	6.903s
ok  	launchpad.net/juju-core/state/api/logger	2.587s
ok  	launchpad.net/juju-core/state/api/machiner	5.229s
ok  	launchpad.net/juju-core/state/api/params	0.037s
ok  	launchpad.net/juju-core/state/api/provisioner	13.176s
ok  	launchpad.net/juju-core/state/api/uniter	40.375s
ok  	launchpad.net/juju-core/state/api/upgrader	4.880s
ok  	launchpad.net/juju-core/state/api/watcher	4.779s
ok  	launchpad.net/juju-core/state/apiserver	5.422s
ok  	launchpad.net/juju-core/state/apiserver/agent	3.935s
ok  	launchpad.net/juju-core/state/apiserver/client	51.173s
ok  	launchpad.net/juju-core/state/apiserver/common	2.071s
ok  	launchpad.net/juju-core/state/apiserver/deployer	5.541s
ok  	launchpad.net/juju-core/state/apiserver/logger	5.512s
ok  	launchpad.net/juju-core/state/apiserver/machine	5.410s
ok  	launchpad.net/juju-core/state/apiserver/provisioner	15.309s
?   	launchpad.net/juju-core/state/apiserver/testing	[no test files]
ok  	launchpad.net/juju-core/state/apiserver/uniter	23.192s
ok  	launchpad.net/juju-core/state/apiserver/upgrader	7.668s
ok  	launchpad.net/juju-core/state/multiwatcher	0.772s
ok  	launchpad.net/juju-core/state/presence	6.884s
?   	launchpad.net/juju-core/state/testing	[no test files]
ok  	launchpad.net/juju-core/state/watcher	6.427s
ok  	launchpad.net/juju-core/store	20.698s
ok  	launchpad.net/juju-core/testing	1.410s
ok  	launchpad.net/juju-core/testing/checkers	0.019s
ok  	launchpad.net/juju-core/testing/testbase	0.021s
ok  	launchpad.net/juju-core/thirdparty/pbkdf2	0.136s
ok  	launchpad.net/juju-core/tools	0.019s
ok  	launchpad.net/juju-core/upstart	1.210s
ok  	launchpad.net/juju-core/utils	2.370s
ok  	launchpad.net/juju-core/utils/fslock	1.145s
ok  	launchpad.net/juju-core/utils/parallel	0.434s
ok  	launchpad.net/juju-core/utils/set	0.027s
ok  	launchpad.net/juju-core/version	0.116s
ok  	launchpad.net/juju-core/worker	6.815s
ok  	launchpad.net/juju-core/worker/addressupdater	1.768s
ok  	launchpad.net/juju-core/worker/cleaner	1.337s
ok  	launchpad.net/juju-core/worker/deployer	4.213s
ok  	launchpad.net/juju-core/worker/firewaller	13.621s
ok  	launchpad.net/juju-core/worker/localstorage	0.048s
ok  	launchpad.net/juju-core/worker/logger	1.931s
ok  	launchpad.net/juju-core/worker/machiner	3.400s
ok  	launchpad.net/juju-core/worker/minunitsworker	1.489s
ok  	launchpad.net/juju-core/worker/provisioner	22.331s
ok  	launchpad.net/juju-core/worker/resumer	1.790s
ok  	launchpad.net/juju-core/worker/uniter	251.706s
ok  	launchpad.net/juju-core/worker/uniter/charm	3.705s
ok  	launchpad.net/juju-core/worker/uniter/debug	0.114s
ok  	launchpad.net/juju-core/worker/uniter/hook	0.015s
ok  	launchpad.net/juju-core/worker/uniter/jujuc	0.552s
ok  	launchpad.net/juju-core/worker/uniter/relation	1.395s
ok  	launchpad.net/juju-core/worker/upgrader	6.784s

warning: building out-of-date packages:
	launchpad.net/goamz/ec2/ec2test
	launchpad.net/goamz/s3/s3test
	launchpad.net/goose/testservices/hook
	launchpad.net/goose/testservices/identityservice
	launchpad.net/goose/testservices
	launchpad.net/goose/testservices/novaservice
	launchpad.net/goose/testservices/swiftservice
	launchpad.net/goose/testservices/openstackservice
	launchpad.net/lpad
installing these packages with 'go test -i ./...' will speed future tests.

Revision history for this message

Go Bot (go-bot) wrote on 2013-11-18:

#

Download full text (14.9 KiB)

The attempt to merge lp:~themue/juju-core/054-env-more-script-friendly into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core/agent 1.530s
ok launchpad.net/juju-core/agent/tools 0.219s
ok launchpad.net/juju-core/bzr 11.013s
ok launchpad.net/juju-core/cert 3.210s
ok launchpad.net/juju-core/charm 1.080s
? launchpad.net/juju-core/charm/hooks [no test files]
ok launchpad.net/juju-core/cloudinit 0.027s
ok launchpad.net/juju-core/cmd 0.196s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/juju 212.694s
ok launchpad.net/juju-core/cmd/jujud 58.720s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 2.963s
ok launchpad.net/juju-core/constraints 0.033s
ok launchpad.net/juju-core/container 0.054s
ok launchpad.net/juju-core/container/kvm 0.049s
ok launchpad.net/juju-core/container/kvm/mock 0.036s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 0.371s
? launchpad.net/juju-core/container/lxc/mock [no test files]
? launchpad.net/juju-core/container/lxc/testing [no test files]
ok launchpad.net/juju-core/downloader 5.341s
ok launchpad.net/juju-core/environs 3.441s
ok launchpad.net/juju-core/environs/bootstrap 5.183s
ok launchpad.net/juju-core/environs/cloudinit 0.510s
ok launchpad.net/juju-core/environs/config 1.406s
ok launchpad.net/juju-core/environs/configstore 0.044s
ok launchpad.net/juju-core/environs/filestorage 0.031s
ok launchpad.net/juju-core/environs/httpstorage 0.982s
ok launchpad.net/juju-core/environs/imagemetadata 0.754s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.062s
ok launchpad.net/juju-core/environs/jujutest 0.220s
ok launchpad.net/juju-core/environs/manual 7.869s
ok launchpad.net/juju-core/environs/simplestreams 0.342s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 1.553s
ok launchpad.net/juju-core/environs/storage 1.185s
ok launchpad.net/juju-core/environs/sync 34.021s
ok launchpad.net/juju-core/environs/testing 0.193s
ok launchpad.net/juju-core/environs/tools 7.622s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/errors 0.026s
ok launchpad.net/juju-core/instance 0.023s
? launchpad.net/juju-core/instance/testing [no test files]

----------------------------------------------------------------------
FAIL: apiconn_test.go:0: DeployLocalSuite.TearDownTest

Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for ...

The attempt to merge lp:~themue/juju-core/054-env-more-script-friendly into lp:juju-core failed. Below is the output from the failed tests.

ok  	launchpad.net/juju-core/agent	1.530s
ok  	launchpad.net/juju-core/agent/tools	0.219s
ok  	launchpad.net/juju-core/bzr	11.013s
ok  	launchpad.net/juju-core/cert	3.210s
ok  	launchpad.net/juju-core/charm	1.080s
?   	launchpad.net/juju-core/charm/hooks	[no test files]
ok  	launchpad.net/juju-core/cloudinit	0.027s
ok  	launchpad.net/juju-core/cmd	0.196s
?   	launchpad.net/juju-core/cmd/charmd	[no test files]
?   	launchpad.net/juju-core/cmd/charmload	[no test files]
ok  	launchpad.net/juju-core/cmd/juju	212.694s
ok  	launchpad.net/juju-core/cmd/jujud	58.720s
ok  	launchpad.net/juju-core/cmd/plugins/juju-metadata	2.963s
ok  	launchpad.net/juju-core/constraints	0.033s
ok  	launchpad.net/juju-core/container	0.054s
ok  	launchpad.net/juju-core/container/kvm	0.049s
ok  	launchpad.net/juju-core/container/kvm/mock	0.036s
?   	launchpad.net/juju-core/container/kvm/testing	[no test files]
ok  	launchpad.net/juju-core/container/lxc	0.371s
?   	launchpad.net/juju-core/container/lxc/mock	[no test files]
?   	launchpad.net/juju-core/container/lxc/testing	[no test files]
ok  	launchpad.net/juju-core/downloader	5.341s
ok  	launchpad.net/juju-core/environs	3.441s
ok  	launchpad.net/juju-core/environs/bootstrap	5.183s
ok  	launchpad.net/juju-core/environs/cloudinit	0.510s
ok  	launchpad.net/juju-core/environs/config	1.406s
ok  	launchpad.net/juju-core/environs/configstore	0.044s
ok  	launchpad.net/juju-core/environs/filestorage	0.031s
ok  	launchpad.net/juju-core/environs/httpstorage	0.982s
ok  	launchpad.net/juju-core/environs/imagemetadata	0.754s
?   	launchpad.net/juju-core/environs/imagemetadata/testing	[no test files]
ok  	launchpad.net/juju-core/environs/instances	0.062s
ok  	launchpad.net/juju-core/environs/jujutest	0.220s
ok  	launchpad.net/juju-core/environs/manual	7.869s
ok  	launchpad.net/juju-core/environs/simplestreams	0.342s
?   	launchpad.net/juju-core/environs/simplestreams/testing	[no test files]
ok  	launchpad.net/juju-core/environs/sshstorage	1.553s
ok  	launchpad.net/juju-core/environs/storage	1.185s
ok  	launchpad.net/juju-core/environs/sync	34.021s
ok  	launchpad.net/juju-core/environs/testing	0.193s
ok  	launchpad.net/juju-core/environs/tools	7.622s
?   	launchpad.net/juju-core/environs/tools/testing	[no test files]
ok  	launchpad.net/juju-core/errors	0.026s
ok  	launchpad.net/juju-core/instance	0.023s
?   	launchpad.net/juju-core/instance/testing	[no test files]

----------------------------------------------------------------------
FAIL: apiconn_test.go:0: DeployLocalSuite.TearDownTest

Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
Waiting for sockets to die: 0 in use, 1 alive
/home/tarmac/trees/src/launchpad.net/juju-core/testing/mgo.go:333:
    c.Fatal("Test left sockets in a dirty state")
... Error: Test left sockets in a dirty state

----------------------------------------------------------------------
PANIC: conn_test.go:452: DeployLocalSuite.TestDeploySettings

[LOG] 7.87171 DEBUG juju.environs.configstore Making /tmp/gocheck-6371863560482907257/12/home/ubuntu/.juju/environments
[LOG] 7.96615 DEBUG juju.environs.tools reading v1.* tools
[LOG] 7.96620 INFO juju environs/testing: uploading FAKE tools 1.17.0-precise-amd64
[LOG] 7.97515 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 7.97517 DEBUG juju.environs.tools no series specified when finding tools, looking for any
[LOG] 7.97524 DEBUG juju.environs.simplestreams fetchData failed for "http://127.0.0.1:33221/dummyenv/private/tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not found
[LOG] 7.97526 DEBUG juju.environs.simplestreams cannot load index "http://127.0.0.1:33221/dummyenv/private/tools/streams/v1/index.sjson": invalid URL "http://127.0.0.1:33221/dummyenv/private/tools/streams/v1/index.sjson" not found
[LOG] 7.97531 DEBUG juju.environs.simplestreams fetchData failed for "http://127.0.0.1:33221/dummyenv/private/tools/streams/v1/index.json": file "tools/streams/v1/index.json" not found not found
[LOG] 7.97533 DEBUG juju.environs.simplestreams cannot load index "http://127.0.0.1:33221/dummyenv/private/tools/streams/v1/index.json": invalid URL "http://127.0.0.1:33221/dummyenv/private/tools/streams/v1/index.json" not found
[LOG] 7.97560 INFO juju.environs.tools Writing tools/streams/v1/index.json
[LOG] 7.97571 INFO juju.environs.tools Writing tools/streams/v1/com.ubuntu.juju:released:tools.json
[LOG] 7.97575 INFO juju.environs.bootstrap bootstrapping environment "dummyenv"
[LOG] 7.97578 DEBUG juju.environs.bootstrap looking for bootstrap tools: series="precise", arch=<nil>, version=1.17.0
[LOG] 7.97580 INFO juju.environs.tools reading tools with major.minor version 1.17
[LOG] 7.97586 INFO juju.environs.tools filtering tools by version: 1.17.0
[LOG] 7.97588 INFO juju.environs.tools filtering tools by series: precise
[LOG] 7.97590 DEBUG juju.environs.tools no architecture specified when finding tools, looking for any
[LOG] 7.97594 DEBUG juju.environs.simplestreams fetchData failed for "http://127.0.0.1:33221/dummyenv/private/tools/streams/v1/index.sjson": file "tools/streams/v1/index.sjson" not found not found
[LOG] 7.97597 DEBUG juju.environs.simplestreams cannot load index "http://127.0.0.1:33221/dummyenv/private/tools/streams/v1/index.sjson": invalid URL "http://127.0.0.1:33221/dummyenv/private/tools/streams/v1/index.sjson" not found
[LOG] 7.97607 DEBUG juju.environs.simplestreams fetchData failed for "http://127.0.0.1:33221/dummyenv/private/tools/streams/v1/mirrors.json": file "tools/streams/v1/mirrors.json" not found not found
[LOG] 7.97609 DEBUG juju.environs.simplestreams no mirror index file found
[LOG] 7.97614 DEBUG juju.environs.simplestreams no mirror information available for { }: mirror data for "com.ubuntu.juju:released:tools" not found
[LOG] 7.97616 DEBUG juju.environs.simplestreams read metadata index at "http://127.0.0.1:33221/dummyenv/private/tools/streams/v1/index.json"
[LOG] 7.97624 DEBUG juju.environs.simplestreams candidate matches for products ["com.ubuntu.juju:12.04:amd64" "com.ubuntu.juju:12.04:i386" "com.ubuntu.juju:12.04:arm"] are [{Mon, 18 Nov 2013 17:42:09 +0000 products:1.0 content-download  [] streams/v1/com.ubuntu.juju:released:tools.json [com.ubuntu.juju:12.04:amd64]}]
[LOG] 7.97626 DEBUG juju.environs.simplestreams finding products at path "streams/v1/com.ubuntu.juju:released:tools.json"
[LOG] 7.97650 DEBUG juju.environs.simplestreams metadata: &{map[com.ubuntu.juju:12.04:amd64:{ 1.17.0 amd64   map[20131118:0xc2006b17e0]}] map[] Mon, 18 Nov 2013 17:42:09 +0000 products:1.0}
[LOG] 7.97656 INFO juju.environs.bootstrap picked newest version: 1.17.0
[LOG] 7.97659 INFO juju.provider.dummy would pick tools from 1.17.0-precise-amd64
[LOG] 8.01145 INFO juju.state opening state; mongo addresses: ["localhost:53091"]; entity ""
[LOG] 8.01460 INFO juju.state connection established
[LOG] 9.59695 INFO juju.state initializing environment
[LOG] 9.61934 INFO juju.state.apiserver listening on "127.0.0.1:38206"
[LOG] 9.63639 INFO juju.state opening state; mongo addresses: ["localhost:53091"]; entity ""
[LOG] 9.64363 INFO juju.state connection established
[LOG] 9.65536 INFO juju juju: authorization error while connecting to state server; retrying
[LOG] 9.65551 INFO juju.state opening state; mongo addresses: ["localhost:53091"]; entity ""
[LOG] 9.66582 INFO juju.state connection established
[LOG] 9.71099 INFO juju state/api: dialing "wss://127.0.0.1:38206/"
[LOG] 9.72336 INFO juju state/api: connection established
[LOG] 9.72353 DEBUG juju.state.apiserver <- [C] <unknown> {"RequestId":1,"Type":"Admin","Request":"Login","Params":{"AuthTag":"user-admin","Password":"dummy-secret","Nonce":""}}
[LOG] 9.72410 DEBUG juju.state.apiserver -> [C] user-admin 547.248us {"RequestId":1,"Response":{}} Admin[""].Login
[LOG] 9.75907 DEBUG juju.state.apiserver <- [C] user-admin {"RequestId":2,"Type":"Client","Request":"EnvironmentGet","Params":{}}
[LOG] 9.76028 DEBUG juju.state.apiserver -> [C] user-admin 1.155182ms {"RequestId":2,"Response":{"Config":{"admin-secret":"","agent-version":"1.17.0","api-port":4321,"authorized-keys":"my-keys","broken":"","ca-cert":"-----BEGIN CERTIFICATE-----\nMIIB4jCCAY6gAwIBAgIBADALBgkqhkiG9w0BAQUwSjENMAsGA1UEChMEanVqdTE5\nMDcGA1UEAwwwanVqdS1nZW5lcmF0ZWQgQ0EgZm9yIGVudmlyb25tZW50ICJqdWp1\nIHRlc3RpbmciMB4XDTEzMTExODE3MzY1MFoXDTIzMTExODE3NDE1MFowSjENMAsG\nA1UEChMEanVqdTE5MDcGA1UEAwwwanVqdS1nZW5lcmF0ZWQgQ0EgZm9yIGVudmly\nb25tZW50ICJqdWp1IHRlc3RpbmciMFowCwYJKoZIhvcNAQEBA0sAMEgCQQCv9hJE\nxEQXR9Pt8RMneTaru/99C7ZezR3fhbS6CdK2X5nRuZ+jeejUBfcZNaz9sUU2MAj7\nbxVFE5P5c3Io1Zc5AgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIApDAPBgNVHRMBAf8E\nBTADAQH/MB0GA1UdDgQWBBT+OliucElzaOo2nJep8J7lotGzITAfBgNVHSMEGDAW\ngBT+OliucElzaOo2nJep8J7lotGzITALBgkqhkiG9w0BAQUDQQCJVvhkApIgwEHY\n6XEnAZqnapE4yiEW7dFeb+mG3w71agzDn/mSCsaCQVR6Je2uQfQyX8tGyX3K/er5\noDfTF+pv\n-----END CERTIFICATE-----\n","ca-private-key":"","default-series":"precise","development":false,"firewall-mode":"instance","image-metadata-url":"","logging-config":"\u003croot\u003e=WARNING;juju=DEBUG","name":"dummyenv","secret":"pork","ssl-hostname-verification":true,"state-id":"27","state-port":1234,"state-server":true,"tools-metadata-url":"","tools-url":"","type":"dummy"}}} Client[""].EnvironmentGet
[LOG] 9.77754 INFO juju writing charm to storage [1418 bytes]
[LOG] 9.77762 INFO juju adding charm to state
[LOG] 9.79761 INFO juju.provider.dummy reset environment
[LOG] 9.81240 INFO juju MgoReset successfully reset admin password
[LOG] 9.82127 INFO juju MgoReset successfully reset admin password
[LOG] 9.82568 INFO juju MgoReset successfully reset admin password
... Panic: Fixture has panicked (see related PANIC)
OOPS: 34 passed, 1 FAILED, 3 MISSED
--- FAIL: Test (30.18 seconds)
FAIL
FAIL	launchpad.net/juju-core/juju	30.439s
ok  	launchpad.net/juju-core/juju/osenv	0.019s
?   	launchpad.net/juju-core/juju/testing	[no test files]
ok  	launchpad.net/juju-core/log	0.015s
ok  	launchpad.net/juju-core/log/syslog	0.052s
ok  	launchpad.net/juju-core/names	0.025s
?   	launchpad.net/juju-core/provider	[no test files]
?   	launchpad.net/juju-core/provider/all	[no test files]
ok  	launchpad.net/juju-core/provider/azure	6.592s
ok  	launchpad.net/juju-core/provider/common	0.631s
ok  	launchpad.net/juju-core/provider/dummy	22.838s
ok  	launchpad.net/juju-core/provider/ec2	5.264s
ok  	launchpad.net/juju-core/provider/ec2/httpstorage	0.256s
ok  	launchpad.net/juju-core/provider/local	2.263s
ok  	launchpad.net/juju-core/provider/maas	10.613s
ok  	launchpad.net/juju-core/provider/null	1.301s
ok  	launchpad.net/juju-core/provider/openstack	12.749s
ok  	launchpad.net/juju-core/rpc	0.092s
ok  	launchpad.net/juju-core/rpc/jsoncodec	0.029s
?   	launchpad.net/juju-core/rpc/rpcreflect	[no test files]
ok  	launchpad.net/juju-core/schema	0.019s
ok  	launchpad.net/juju-core/state	96.439s
ok  	launchpad.net/juju-core/state/api	1.859s
ok  	launchpad.net/juju-core/state/api/agent	2.414s
?   	launchpad.net/juju-core/state/api/common	[no test files]
ok  	launchpad.net/juju-core/state/api/deployer	8.786s
ok  	launchpad.net/juju-core/state/api/logger	2.709s
ok  	launchpad.net/juju-core/state/api/machiner	3.845s
ok  	launchpad.net/juju-core/state/api/params	0.058s
ok  	launchpad.net/juju-core/state/api/provisioner	13.495s
ok  	launchpad.net/juju-core/state/api/uniter	36.972s
ok  	launchpad.net/juju-core/state/api/upgrader	5.150s
ok  	launchpad.net/juju-core/state/api/watcher	3.857s
ok  	launchpad.net/juju-core/state/apiserver	5.006s
ok  	launchpad.net/juju-core/state/apiserver/agent	3.662s
ok  	launchpad.net/juju-core/state/apiserver/client	47.312s
ok  	launchpad.net/juju-core/state/apiserver/common	1.681s
ok  	launchpad.net/juju-core/state/apiserver/deployer	5.470s
ok  	launchpad.net/juju-core/state/apiserver/logger	4.389s
ok  	launchpad.net/juju-core/state/apiserver/machine	5.151s
ok  	launchpad.net/juju-core/state/apiserver/provisioner	14.090s
?   	launchpad.net/juju-core/state/apiserver/testing	[no test files]
ok  	launchpad.net/juju-core/state/apiserver/uniter	23.131s
ok  	launchpad.net/juju-core/state/apiserver/upgrader	7.710s
ok  	launchpad.net/juju-core/state/multiwatcher	0.873s
ok  	launchpad.net/juju-core/state/presence	6.796s
?   	launchpad.net/juju-core/state/testing	[no test files]
ok  	launchpad.net/juju-core/state/watcher	6.270s
ok  	launchpad.net/juju-core/store	21.069s
ok  	launchpad.net/juju-core/testing	1.453s
ok  	launchpad.net/juju-core/testing/checkers	0.021s
ok  	launchpad.net/juju-core/testing/testbase	0.020s
ok  	launchpad.net/juju-core/thirdparty/pbkdf2	0.139s
ok  	launchpad.net/juju-core/tools	0.022s
ok  	launchpad.net/juju-core/upstart	1.251s
ok  	launchpad.net/juju-core/utils	2.415s
ok  	launchpad.net/juju-core/utils/fslock	0.977s
ok  	launchpad.net/juju-core/utils/parallel	0.422s
ok  	launchpad.net/juju-core/utils/set	0.032s
ok  	launchpad.net/juju-core/version	0.086s
ok  	launchpad.net/juju-core/worker	6.882s
ok  	launchpad.net/juju-core/worker/addressupdater	1.751s
ok  	launchpad.net/juju-core/worker/cleaner	1.400s
ok  	launchpad.net/juju-core/worker/deployer	4.282s
ok  	launchpad.net/juju-core/worker/firewaller	13.708s
ok  	launchpad.net/juju-core/worker/localstorage	0.050s
ok  	launchpad.net/juju-core/worker/logger	1.778s
ok  	launchpad.net/juju-core/worker/machiner	3.643s
ok  	launchpad.net/juju-core/worker/minunitsworker	1.549s
ok  	launchpad.net/juju-core/worker/provisioner	21.566s
ok  	launchpad.net/juju-core/worker/resumer	1.849s
ok  	launchpad.net/juju-core/worker/uniter	193.150s
ok  	launchpad.net/juju-core/worker/uniter/charm	5.885s
ok  	launchpad.net/juju-core/worker/uniter/debug	0.126s
ok  	launchpad.net/juju-core/worker/uniter/hook	0.018s
ok  	launchpad.net/juju-core/worker/uniter/jujuc	0.551s
ok  	launchpad.net/juju-core/worker/uniter/relation	1.444s
ok  	launchpad.net/juju-core/worker/upgrader	4.848s

warning: building out-of-date packages:
	launchpad.net/goamz/ec2/ec2test
	launchpad.net/goamz/s3/s3test
	launchpad.net/goose/testservices/hook
	launchpad.net/goose/testservices/identityservice
	launchpad.net/goose/testservices
	launchpad.net/goose/testservices/novaservice
	launchpad.net/goose/testservices/swiftservice
	launchpad.net/goose/testservices/openstackservice
	launchpad.net/lpad
installing these packages with 'go test -i ./...' will speed future tests.

juju-core

Merge lp:~themue/juju-core/054-env-more-script-friendly into lp:~go-bot/juju-core/trunk

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'cmd/juju/switch.go'
 --- cmd/juju/switch.go	2013-10-08 14:53:20 +0000
 +++ cmd/juju/switch.go	2013-11-18 16:47:14 +0000
@@ -69,17 +69,17 @@
  	jujuEnv := os.Getenv("JUJU_ENV")
  	if jujuEnv != "" {
  		if c.EnvName == "" {
--			fmt.Fprintf(ctx.Stdout, "Current environment: %q (from JUJU_ENV)\n", jujuEnv)
++			fmt.Fprintf(ctx.Stdout, "%s\n", jujuEnv)
  			return nil
  		} else {
--			return fmt.Errorf("Cannot switch when JUJU_ENV is overriding the environment (set to %q)", jujuEnv)
++			return fmt.Errorf("cannot switch when JUJU_ENV is overriding the environment (set to %q)", jujuEnv)
+ 		}
+ 	}
  	// Passing through the empty string reads the default environments.yaml file.
  	environments, err := environs.ReadEnvirons("")
  	if err != nil {
--		return errors.New("couldn't read the environment.")
++		return errors.New("couldn't read the environment")
+ 	}
  	names := environments.Names()
  	sort.Strings(names)
@@ -89,32 +89,35 @@
  		currentEnv = environments.Default
+ 	}
--	// In order to have only a set environment name quoted, make a small function
--	env := func() string {
--		if currentEnv == "" {
--			return "<not specified>"
--		}
--		return fmt.Sprintf("%q", currentEnv)
--	}
--
--	if c.EnvName == "" || c.EnvName == currentEnv {
--		fmt.Fprintf(ctx.Stdout, "Current environment: %s\n", env())
--	} else {
--		// Check to make sure that the specified environment
++	// Handle the different operation modes.
++	switch {
++	case c.List:
++		// List all environments.
++		if c.EnvName != "" {
++			return errors.New("cannot switch and list at the same time")
++		}
++		for _, name := range names {
++			fmt.Fprintf(ctx.Stdout, "%s\n", name)
++		}
++	case c.EnvName == "" && currentEnv == "":
++		// Nothing specified and nothing to switch to.
++		return errors.New("no currently specified environment")
++	case c.EnvName == "":
++		// Simply print the current environment.
++		fmt.Fprintf(ctx.Stdout, "%s\n", currentEnv)
++	default:
++		// Switch the environment.
  		if !validEnvironmentName(c.EnvName, names) {
  			return fmt.Errorf("%q is not a name of an existing defined environment", c.EnvName)
+ 		}
  		if err := cmd.WriteCurrentEnvironment(c.EnvName); err != nil {
  			return err
+ 		}
--		fmt.Fprintf(ctx.Stdout, "Changed default environment from %s to %q\n", env(), c.EnvName)
--	}
--	if c.List {
--		fmt.Fprintf(ctx.Stdout, "\nEnvironments:\n")
--		for _, name := range names {
--			fmt.Fprintf(ctx.Stdout, "\t%s\n", name)
++		if currentEnv == "" {
++			fmt.Fprintf(ctx.Stdout, "-> %s\n", c.EnvName)
++		} else {
++			fmt.Fprintf(ctx.Stdout, "%s -> %s\n", currentEnv, c.EnvName)
+ 		}
+ 	}
--
  	return nil
+ }
 === modified file 'cmd/juju/switch_test.go'
 --- cmd/juju/switch_test.go	2013-09-13 14:48:13 +0000
 +++ cmd/juju/switch_test.go	2013-11-18 16:47:14 +0000
@@ -21,21 +21,20 @@
  func (*SwitchSimpleSuite) TestNoEnvironment(c *gc.C) {
  	defer testing.MakeEmptyFakeHome(c).Restore()
  	_, err := testing.RunCommand(c, &SwitchCommand{}, nil)
--	c.Assert(err, gc.ErrorMatches, "couldn't read the environment.")
++	c.Assert(err, gc.ErrorMatches, "couldn't read the environment")
+ }
  func (*SwitchSimpleSuite) TestNoDefault(c *gc.C) {
  	defer testing.MakeFakeHome(c, testing.MultipleEnvConfigNoDefault).Restore()
--	context, err := testing.RunCommand(c, &SwitchCommand{}, nil)
--	c.Assert(err, gc.IsNil)
--	c.Assert(testing.Stdout(context), gc.Equals, "Current environment: <not specified>\n")
++	_, err := testing.RunCommand(c, &SwitchCommand{}, nil)
++	c.Assert(err, gc.ErrorMatches, "no currently specified environment")
+ }
  func (*SwitchSimpleSuite) TestShowsDefault(c *gc.C) {
  	defer testing.MakeFakeHome(c, testing.MultipleEnvConfig).Restore()
  	context, err := testing.RunCommand(c, &SwitchCommand{}, nil)
  	c.Assert(err, gc.IsNil)
--	c.Assert(testing.Stdout(context), gc.Equals, "Current environment: \"erewhemos\"\n")
++	c.Assert(testing.Stdout(context), gc.Equals, "erewhemos\n")
+ }
  func (*SwitchSimpleSuite) TestCurrentEnvironmentHasPrecidence(c *gc.C) {
@@ -44,7 +43,7 @@
  	home.AddFiles(c, []testing.TestFile{{".juju/current-environment", "fubar"}})
  	context, err := testing.RunCommand(c, &SwitchCommand{}, nil)
  	c.Assert(err, gc.IsNil)
--	c.Assert(testing.Stdout(context), gc.Equals, "Current environment: \"fubar\"\n")
++	c.Assert(testing.Stdout(context), gc.Equals, "fubar\n")
+ }
  func (*SwitchSimpleSuite) TestShowsJujuEnv(c *gc.C) {
@@ -52,7 +51,7 @@
  	os.Setenv("JUJU_ENV", "using-env")
  	context, err := testing.RunCommand(c, &SwitchCommand{}, nil)
  	c.Assert(err, gc.IsNil)
--	c.Assert(testing.Stdout(context), gc.Equals, "Current environment: \"using-env\" (from JUJU_ENV)\n")
++	c.Assert(testing.Stdout(context), gc.Equals, "using-env\n")
+ }
  func (*SwitchSimpleSuite) TestJujuEnvOverCurrentEnvironment(c *gc.C) {
@@ -62,14 +61,14 @@
  	os.Setenv("JUJU_ENV", "using-env")
  	context, err := testing.RunCommand(c, &SwitchCommand{}, nil)
  	c.Assert(err, gc.IsNil)
--	c.Assert(testing.Stdout(context), gc.Equals, "Current environment: \"using-env\" (from JUJU_ENV)\n")
++	c.Assert(testing.Stdout(context), gc.Equals, "using-env\n")
+ }
  func (*SwitchSimpleSuite) TestSettingWritesFile(c *gc.C) {
  	defer testing.MakeFakeHome(c, testing.MultipleEnvConfig).Restore()
  	context, err := testing.RunCommand(c, &SwitchCommand{}, []string{"erewhemos-2"})
  	c.Assert(err, gc.IsNil)
--	c.Assert(testing.Stdout(context), gc.Equals, "Changed default environment from \"erewhemos\" to \"erewhemos-2\"\n")
++	c.Assert(testing.Stdout(context), gc.Equals, "erewhemos -> erewhemos-2\n")
  	c.Assert(cmd.ReadCurrentEnvironment(), gc.Equals, "erewhemos-2")
+ }
@@ -83,29 +82,24 @@
  	defer testing.MakeFakeHome(c, testing.MultipleEnvConfig).Restore()
  	os.Setenv("JUJU_ENV", "using-env")
  	_, err := testing.RunCommand(c, &SwitchCommand{}, []string{"erewhemos-2"})
--	c.Assert(err, gc.ErrorMatches, `Cannot switch when JUJU_ENV is overriding the environment \(set to "using-env"\)`)
++	c.Assert(err, gc.ErrorMatches, `cannot switch when JUJU_ENV is overriding the environment \(set to "using-env"\)`)
+ }
--const expectedEnvironments = `
--Environments:
--	erewhemos
--	erewhemos-2
++const expectedEnvironments = `erewhemos
++erewhemos-2
+ `
  func (*SwitchSimpleSuite) TestListEnvironments(c *gc.C) {
  	defer testing.MakeFakeHome(c, testing.MultipleEnvConfig).Restore()
  	context, err := testing.RunCommand(c, &SwitchCommand{}, []string{"--list"})
  	c.Assert(err, gc.IsNil)
--	c.Assert(testing.Stdout(context), gc.Matches, "Current environment: \"erewhemos\"(.|\n)*")
--	c.Assert(testing.Stdout(context), gc.Matches, "(.|\n)*"+expectedEnvironments)
++	c.Assert(testing.Stdout(context), gc.Equals, expectedEnvironments)
+ }
  func (*SwitchSimpleSuite) TestListEnvironmentsAndChange(c *gc.C) {
  	defer testing.MakeFakeHome(c, testing.MultipleEnvConfig).Restore()
--	context, err := testing.RunCommand(c, &SwitchCommand{}, []string{"--list", "erewhemos-2"})
--	c.Assert(err, gc.IsNil)
--	c.Assert(testing.Stdout(context), gc.Matches, "Changed default environment from \"erewhemos\" to \"erewhemos-2\"(.|\n)*")
--	c.Assert(testing.Stdout(context), gc.Matches, "(.|\n)*"+expectedEnvironments)
++	_, err := testing.RunCommand(c, &SwitchCommand{}, []string{"--list", "erewhemos-2"})
++	c.Assert(err, gc.ErrorMatches, "cannot switch and list at the same time")
+ }
  func (*SwitchSimpleSuite) TestTooManyParams(c *gc.C) {