Merge lp:~jameinel/juju-core/main-test into lp:~juju/juju-core/trunk

[John A Meinel]

cmd/juju/main_test.go: fix a test case

The addition of generate-config affected a test that must have been missed.
This makes the test pass again.

[Ian Booth (wallyworld)]

Thanks for fixing

review: Approve

[John A Meinel (jameinel)]

*** Submitted:

cmd/juju/main_test.go: fix a test case

The addition of generate-config affected a test that must have been missed.
This makes the test pass again.

=== modified file 'cmd/juju/main_test.go'
--- cmd/juju/main_test.go	2013-01-18 00:24:17 +0000
+++ cmd/juju/main_test.go	2013-02-07 06:31:21 +0000
@@ -141,6 +141,7 @@
 	"destroy-service",
 	"destroy-unit",
 	"expose",
+	"generate-config",
 	"get",
 	"remove-relation",
 	"remove-unit",