← Back to branch summary

~ubuntu-branches/ubuntu/trusty/juju-core/trusty-proposed

« back to all changes in this revision

Viewing changes to src/launchpad.net/juju-core/cmd/juju/cmd_test.go

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-01-29 11:40:20 UTC
  • mfrom: (23.1.1 trusty-proposed)
  • Revision ID: package-import@ubuntu.com-20140129114020-ejieitm8smtt5vln
Tags: 1.17.1-0ubuntu2
d/tests/local-provider: Don't fail tests if ~/.juju is present as its
created by the juju version command. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/launchpad.net/juju-core/cmd/juju/cmd_test.go
109
109
 
110
110
                // JUJU_ENV is the final place the environment can be overriden
111
111
                com, args = cmdFunc()
112
 
                oldenv := os.Getenv(osenv.JujuEnv)
113
 
                os.Setenv(osenv.JujuEnv, "walthamstow")
 
112
                oldenv := os.Getenv(osenv.JujuEnvEnvKey)
 
113
                os.Setenv(osenv.JujuEnvEnvKey, "walthamstow")
114
114
                testInit(c, com, args, "")
115
 
                os.Setenv(osenv.JujuEnv, oldenv)
 
115
                os.Setenv(osenv.JujuEnvEnvKey, oldenv)
116
116
                assertConnName(c, com, "walthamstow")
117
117
 
118
118
                com, args = cmdFunc()
199
199
}
200
200
 
201
201
func (*CmdSuite) TestDeployCommandInit(c *gc.C) {
202
 
        defer os.Setenv(osenv.JujuRepository, os.Getenv(osenv.JujuRepository))
203
 
        os.Setenv(osenv.JujuRepository, "/path/to/repo")
 
202
        defer os.Setenv(osenv.JujuRepositoryEnvKey, os.Getenv(osenv.JujuRepositoryEnvKey))
 
203
        os.Setenv(osenv.JujuRepositoryEnvKey, "/path/to/repo")
204
204
 
205
205
        for _, t := range deployTests {
206
206
                initExpectations(t.com)