Merge lp://staging/~niemeyer/juju-core/fix-firewall-mode-tests into lp://staging/~juju/juju-core/trunk

Reviewers: mp+129718_code.launchpad.net,

Message:
Please take a look.

Description:
state: fix firewall-mode tests

Firewall mode default is now spelled as "".

https://code.launchpad.net/~niemeyer/juju-core/fix-firewall-mode-tests/+merge/129718

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M state/state_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: <email address hidden>
+New revision: <email address hidden>

Index: state/state_test.go
=== modified file 'state/state_test.go'
--- state/state_test.go 2012-10-12 00:03:54 +0000
+++ state/state_test.go 2012-10-15 16:47:11 +0000
@@ -239,7 +239,7 @@
    "authorized-keys": "i-am-a-key",
    "default-series": "precise",
    "development": true,
- "firewall-mode": "default",
+ "firewall-mode": "",
    "admin-secret": "",
   }
   cfg, err := config.New(initial)
@@ -630,7 +630,7 @@
    "authorized-keys": "i-am-a-key",
    "default-series": "precise",
    "development": true,
- "firewall-mode": "default",
+ "firewall-mode": "",
    "admin-secret": "",
   }
   cfg, err := config.New(m)
@@ -650,7 +650,7 @@
    "authorized-keys": "i-am-a-key",
    "default-series": "precise",
    "development": true,
- "firewall-mode": "default",
+ "firewall-mode": "",
    "admin-secret": "",
   }
   cfg, err := config.New(m)
@@ -669,7 +669,7 @@
    "authorized-keys": "i-am-not-an-animal",
    "default-series": "xanadu",
    "development": false,
- "firewall-mode": "default",
+ "firewall-mode": "",
    "admin-secret": "",
   }
   cfg, err = config.New(m)

LGTM, although i'm not sure we need to explicitly mention
firewall-mode in all those places.

On 15 October 2012 17:58, Gustavo Niemeyer <email address hidden> wrote:
> Reviewers: mp+129718_code.launchpad.net,
>
> Message:
> Please take a look.
>
> Description:
> state: fix firewall-mode tests
>
> Firewall mode default is now spelled as "".
>
> https://code.launchpad.net/~niemeyer/juju-core/fix-firewall-mode-tests/+merge/129718
>
> (do not edit description out of merge proposal)
>
>
> Please review this at https://codereview.appspot.com/6699044/
>
> Affected files:
> A [revision details]
> M state/state_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: <email address hidden>
> +New revision: <email address hidden>
>
> Index: state/state_test.go
> === modified file 'state/state_test.go'
> --- state/state_test.go 2012-10-12 00:03:54 +0000
> +++ state/state_test.go 2012-10-15 16:47:11 +0000
> @@ -239,7 +239,7 @@
> "authorized-keys": "i-am-a-key",
> "default-series": "precise",
> "development": true,
> - "firewall-mode": "default",
> + "firewall-mode": "",
> "admin-secret": "",
> }
> cfg, err := config.New(initial)
> @@ -630,7 +630,7 @@
> "authorized-keys": "i-am-a-key",
> "default-series": "precise",
> "development": true,
> - "firewall-mode": "default",
> + "firewall-mode": "",
> "admin-secret": "",
> }
> cfg, err := config.New(m)
> @@ -650,7 +650,7 @@
> "authorized-keys": "i-am-a-key",
> "default-series": "precise",
> "development": true,
> - "firewall-mode": "default",
> + "firewall-mode": "",
> "admin-secret": "",
> }
> cfg, err := config.New(m)
> @@ -669,7 +669,7 @@
> "authorized-keys": "i-am-not-an-animal",
> "default-series": "xanadu",
> "development": false,
> - "firewall-mode": "default",
> + "firewall-mode": "",
> "admin-secret": "",
> }
> cfg, err = config.New(m)
>
>
>
>
>
> --
> https://code.launchpad.net/~niemeyer/juju-core/fix-firewall-mode-tests/+merge/129718
> Your team The Go Language Gophers is requested to review the proposed merge of lp:~niemeyer/juju-core/fix-firewall-mode-tests into lp:juju-core.

*** Submitted:

state: fix firewall-mode tests

Firewall mode default is now spelled as "".

R=
CC=
https://codereview.appspot.com/6699044

https://codereview.appspot.com/6699044/