Merge lp:~thumper/juju-core/fix-test-creating-file-in-tree into lp:~go-bot/juju-core/trunk

[Tim Penhey]

Fix the cmd/juju tests.

One of the tests was emitting an error, but the suite wasn't
a logging suite, so it was being output to stderr.

Also, there was a file called 2 created in the directory. This
was due to an echo >2 line in a plugin test script. This was
wrong anyway, we don't emit missing description as it fails other
tests. This has been removed.

https://codereview.appspot.com/10253053/

Fix the cmd/juju tests.

One of the tests was emitting an error, but the suite wasn't
a logging suite, so it was being output to stderr.

Also, there was a file called 2 created in the directory. This
was due to an echo >2 line in a plugin test script. This was
wrong anyway, we don't emit missing description as it fails other
tests. This has been removed.

https://codereview.appspot.com/10253053/

[Tim Penhey (thumper)]

Reviewers: mp+169324_code.launchpad.net,

Message:
Please take a look.

Description:
Fix the cmd/juju tests.

One of the tests was emitting an error, but the suite wasn't
a logging suite, so it was being output to stderr.

Also, there was a file called 2 created in the directory. This
was due to an echo >2 line in a plugin test script. This was
wrong anyway, we don't emit missing description as it fails other
tests. This has been removed.

https://code.launchpad.net/~thumper/juju-core/fix-test-creating-file-in-tree/+merge/169324

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M cmd/juju/plugin_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-20130613115315-e58eqa122kc07o1a
+New revision: <email address hidden>

Index: cmd/juju/plugin_test.go
=== modified file 'cmd/juju/plugin_test.go'
--- cmd/juju/plugin_test.go 2013-06-13 10:56:08 +0000
+++ cmd/juju/plugin_test.go 2013-06-14 02:08:04 +0000
@@ -17,6 +17,7 @@
  )

  type PluginSuite struct {
+ testing.LoggingSuite
   oldPath string
   home *testing.FakeHome
  }
@@ -24,6 +25,7 @@
  var _ = Suite(&PluginSuite{})

  func (suite *PluginSuite) SetUpTest(c *C) {
+ suite.LoggingSuite.SetUpTest(c)
   suite.oldPath = os.Getenv("PATH")
   suite.home = testing.MakeSampleHome(c)
   os.Setenv("PATH", "/bin:"+testing.HomePath())
@@ -32,6 +34,7 @@
  func (suite *PluginSuite) TearDownTest(c *C) {
   suite.home.Restore()
   os.Setenv("PATH", suite.oldPath)
+ suite.LoggingSuite.TearDownTest(c)
  }

  func (*PluginSuite) TestFindPlugins(c *C) {
@@ -195,8 +198,6 @@
    fi
    echo "{{.Name}} description"
    exit {{.ExitStatus}}
-else
- echo "No --description" >2
  fi

  if [ "$1" = "--help" ]; then

[Ian Booth (wallyworld)]

LGTM

https://codereview.appspot.com/10253053/

[William Reade (fwereade)]

LGTM

https://codereview.appspot.com/10253053/

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 2013-06-14 6:13, Tim Penhey wrote:
> Tim Penhey has proposed merging
> lp:~thumper/juju-core/fix-test-creating-file-in-tree into
> lp:juju-core.
>
> Requested reviews: juju hackers (juju)
>
> For more details, see:
> https://code.launchpad.net/~thumper/juju-core/fix-test-creating-file-in-tree/+merge/169324
>
> Fix the cmd/juju tests.
>
> One of the tests was emitting an error, but the suite wasn't a
> logging suite, so it was being output to stderr.
>
> Also, there was a file called 2 created in the directory. This was
> due to an echo >2 line in a plugin test script. This was wrong
> anyway, we don't emit missing description as it fails other tests.
> This has been removed.
>
> https://codereview.appspot.com/10253053/
>

LGTM trivial

I think the second one was my fault. I was debugging what was going
on, and meant to be typing ">&2". Anyway, I wanted it removed
regardless. Thanks for noticing.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.13 (Cygwin)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iEUEARECAAYFAlG9d5kACgkQJdeBCYSNAAOiTACYkygrEGQfYREiVeszGgHKrhqQ
GQCg2QbrXLJiZ7eh7w8+nTML3Zlz+L4=
=KxJ0
-----END PGP SIGNATURE-----

=== modified file 'cmd/juju/plugin_test.go'
--- cmd/juju/plugin_test.go	2013-06-13 10:56:08 +0000
+++ cmd/juju/plugin_test.go	2013-06-14 02:12:27 +0000
@@ -17,6 +17,7 @@
 )
 
 type PluginSuite struct {
+	testing.LoggingSuite
 	oldPath string
 	home    *testing.FakeHome
 }
@@ -24,6 +25,7 @@
 var _ = Suite(&PluginSuite{})
 
 func (suite *PluginSuite) SetUpTest(c *C) {
+	suite.LoggingSuite.SetUpTest(c)
 	suite.oldPath = os.Getenv("PATH")
 	suite.home = testing.MakeSampleHome(c)
 	os.Setenv("PATH", "/bin:"+testing.HomePath())
@@ -32,6 +34,7 @@
 func (suite *PluginSuite) TearDownTest(c *C) {
 	suite.home.Restore()
 	os.Setenv("PATH", suite.oldPath)
+	suite.LoggingSuite.TearDownTest(c)
 }
 
 func (*PluginSuite) TestFindPlugins(c *C) {
@@ -195,8 +198,6 @@
   fi
   echo "{{.Name}} description"
   exit {{.ExitStatus}}
-else
-  echo "No --description" >2
 fi
 
 if [ "$1" = "--help" ]; then