Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(294)

Side by Side Diff: cmd/juju/cmd_test.go

Issue 6501106: environs: remove VarDir global
Patch Set: environs: remove VarDir global Created 11 years, 6 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « [revision details] ('k') | cmd/jujud/agent.go » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 package main 1 package main
2 2
3 import ( 3 import (
4 "launchpad.net/gnuflag" 4 "launchpad.net/gnuflag"
5 . "launchpad.net/gocheck" 5 . "launchpad.net/gocheck"
6 "launchpad.net/juju-core/cmd" 6 "launchpad.net/juju-core/cmd"
7 "launchpad.net/juju-core/environs" 7 "launchpad.net/juju-core/environs"
8 "launchpad.net/juju-core/environs/dummy" 8 "launchpad.net/juju-core/environs/dummy"
9 "launchpad.net/juju-core/juju/testing" 9 "launchpad.net/juju-core/juju/testing"
10 "launchpad.net/juju-core/version" 10 "launchpad.net/juju-core/version"
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 opc, errc = runCommand(new(BootstrapCommand), "--upload-tools") 136 opc, errc = runCommand(new(BootstrapCommand), "--upload-tools")
137 c.Check(<-errc, IsNil) 137 c.Check(<-errc, IsNil)
138 c.Check((<-opc).(dummy.OpPutFile).Env, Equals, "peckham") 138 c.Check((<-opc).(dummy.OpPutFile).Env, Equals, "peckham")
139 c.Check((<-opc).(dummy.OpBootstrap).Env, Equals, "peckham") 139 c.Check((<-opc).(dummy.OpBootstrap).Env, Equals, "peckham")
140 140
141 envs, err := environs.ReadEnvirons("") 141 envs, err := environs.ReadEnvirons("")
142 c.Assert(err, IsNil) 142 c.Assert(err, IsNil)
143 env, err := envs.Open("peckham") 143 env, err := envs.Open("peckham")
144 c.Assert(err, IsNil) 144 c.Assert(err, IsNil)
145 145
146 oldVarDir := environs.VarDir
147 defer func() {
148 environs.VarDir = oldVarDir
149 }()
150 environs.VarDir = c.MkDir()
151
152 tools, err := environs.FindTools(env, version.Current, environs.CompatVe rsion) 146 tools, err := environs.FindTools(env, version.Current, environs.CompatVe rsion)
153 c.Assert(err, IsNil) 147 c.Assert(err, IsNil)
154 resp, err := http.Get(tools.URL) 148 resp, err := http.Get(tools.URL)
155 c.Assert(err, IsNil) 149 c.Assert(err, IsNil)
156 defer resp.Body.Close() 150 defer resp.Body.Close()
157 151
158 » err = environs.UnpackTools(tools, resp.Body) 152 » err = environs.UnpackTools(c.MkDir(), tools, resp.Body)
159 c.Assert(err, IsNil) 153 c.Assert(err, IsNil)
160 154
161 // bootstrap with broken environment 155 // bootstrap with broken environment
162 opc, errc = runCommand(new(BootstrapCommand), "-e", "brokenenv") 156 opc, errc = runCommand(new(BootstrapCommand), "-e", "brokenenv")
163 c.Check(<-errc, ErrorMatches, "dummy.Bootstrap is broken") 157 c.Check(<-errc, ErrorMatches, "dummy.Bootstrap is broken")
164 c.Check(<-opc, IsNil) 158 c.Check(<-opc, IsNil)
165 } 159 }
166 160
167 func (*CmdSuite) TestDestroyEnvironmentCommand(c *C) { 161 func (*CmdSuite) TestDestroyEnvironmentCommand(c *C) {
168 // normal destroy 162 // normal destroy
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 return com, com.Init(newFlagSet(), args) 280 return com, com.Init(newFlagSet(), args)
287 } 281 }
288 282
289 func (*CmdSuite) TestUnexposeCommandInit(c *C) { 283 func (*CmdSuite) TestUnexposeCommandInit(c *C) {
290 // missing args 284 // missing args
291 _, err := initUnexposeCommand() 285 _, err := initUnexposeCommand()
292 c.Assert(err, ErrorMatches, "no service name specified") 286 c.Assert(err, ErrorMatches, "no service name specified")
293 287
294 // environment tested elsewhere 288 // environment tested elsewhere
295 } 289 }
OLDNEW
« no previous file with comments | « [revision details] ('k') | cmd/jujud/agent.go » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b