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

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

Issue 6198064: environs: upload juju tools to cloud.
Patch Set: environs: upload juju tools to cloud. Created 12 years, 10 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
OLDNEW
1 package main_test 1 package main_test
2 2
3 import ( 3 import (
4 "io/ioutil" 4 "io/ioutil"
5 "launchpad.net/gnuflag" 5 "launchpad.net/gnuflag"
6 . "launchpad.net/gocheck" 6 . "launchpad.net/gocheck"
7 "launchpad.net/juju/go/cmd" 7 "launchpad.net/juju/go/cmd"
8 main "launchpad.net/juju/go/cmd/juju" 8 main "launchpad.net/juju/go/cmd/juju"
9 "launchpad.net/juju/go/environs" 9 "launchpad.net/juju/go/environs"
10 "launchpad.net/juju/go/environs/dummy" 10 "launchpad.net/juju/go/environs/dummy"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 return 129 return
130 } 130 }
131 131
132 err = com.Run(cmd.DefaultContext()) 132 err = com.Run(cmd.DefaultContext())
133 errc <- err 133 errc <- err
134 }() 134 }()
135 return 135 return
136 } 136 }
137 137
138 func (*cmdSuite) TestBootstrapCommand(c *C) { 138 func (*cmdSuite) TestBootstrapCommand(c *C) {
139 defer dummy.Reset()
niemeyer 2012/05/21 21:29:10 Why is this necessary, considering that TearDownTe
rog 2012/05/22 09:00:58 Done.
140
139 // normal bootstrap 141 // normal bootstrap
140 opc, errc := runCommand(new(main.BootstrapCommand)) 142 opc, errc := runCommand(new(main.BootstrapCommand))
141 c.Check(<-opc, Equals, op(dummy.OpBootstrap, "peckham")) 143 c.Check(<-opc, Equals, op(dummy.OpBootstrap, "peckham"))
142 c.Check(<-errc, IsNil) 144 c.Check(<-errc, IsNil)
143 145
144 // bootstrap with tool uploading - checking that a file 146 // bootstrap with tool uploading - checking that a file
145 // is uploaded should be sufficient, as the detailed semantics 147 // is uploaded should be sufficient, as the detailed semantics
146 // of UploadTools are tested in environs. 148 // of UploadTools are tested in environs.
147 opc, errc = runCommand(new(main.BootstrapCommand), "--upload-tools") 149 opc, errc = runCommand(new(main.BootstrapCommand), "--upload-tools")
148 c.Check(<-opc, Equals, op(dummy.OpPutFile, "peckham")) 150 c.Check(<-opc, Equals, op(dummy.OpPutFile, "peckham"))
149 c.Check(<-opc, Equals, op(dummy.OpBootstrap, "peckham")) 151 c.Check(<-opc, Equals, op(dummy.OpBootstrap, "peckham"))
150 c.Check(<-errc, IsNil) 152 c.Check(<-errc, IsNil)
151 153
152 envs, err := environs.ReadEnvirons("") 154 envs, err := environs.ReadEnvirons("")
153 c.Assert(err, IsNil) 155 c.Assert(err, IsNil)
154 env, err := envs.Open("peckham") 156 env, err := envs.Open("peckham")
155 c.Assert(err, IsNil) 157 c.Assert(err, IsNil)
156 dir := c.MkDir() 158 dir := c.MkDir()
157 » err = environs.GetTools(env.Storage(), dir) 159 » err = environs.GetTools(env, dir)
158 c.Assert(err, IsNil) 160 c.Assert(err, IsNil)
159 161
160 // bootstrap with broken environment 162 // bootstrap with broken environment
161 opc, errc = runCommand(new(main.BootstrapCommand), "-e", "barking") 163 opc, errc = runCommand(new(main.BootstrapCommand), "-e", "barking")
162 c.Check((<-opc).Kind, Equals, dummy.OpNone) 164 c.Check((<-opc).Kind, Equals, dummy.OpNone)
163 c.Check(<-errc, ErrorMatches, `broken environment`) 165 c.Check(<-errc, ErrorMatches, `broken environment`)
164 } 166 }
165 167
166 func (*cmdSuite) TestDestroyCommand(c *C) { 168 func (*cmdSuite) TestDestroyCommand(c *C) {
167 // normal destroy 169 // normal destroy
168 opc, errc := runCommand(new(main.DestroyCommand)) 170 opc, errc := runCommand(new(main.DestroyCommand))
169 c.Check(<-opc, Equals, op(dummy.OpDestroy, "peckham")) 171 c.Check(<-opc, Equals, op(dummy.OpDestroy, "peckham"))
170 c.Check(<-errc, IsNil) 172 c.Check(<-errc, IsNil)
171 173
172 // destroy with broken environment 174 // destroy with broken environment
173 opc, errc = runCommand(new(main.DestroyCommand), "-e", "barking") 175 opc, errc = runCommand(new(main.DestroyCommand), "-e", "barking")
174 c.Check((<-opc).Kind, Equals, dummy.OpNone) 176 c.Check((<-opc).Kind, Equals, dummy.OpNone)
175 c.Check(<-errc, ErrorMatches, `broken environment`) 177 c.Check(<-errc, ErrorMatches, `broken environment`)
176 } 178 }
177 179
178 func op(kind dummy.OperationKind, name string) dummy.Operation { 180 func op(kind dummy.OperationKind, name string) dummy.Operation {
179 return dummy.Operation{ 181 return dummy.Operation{
180 Env: name, 182 Env: name,
181 Kind: kind, 183 Kind: kind,
182 } 184 }
183 } 185 }
OLDNEW
« no previous file with comments | « [revision details] ('k') | environs/dummy/environs.go » ('j') | environs/ec2/image.go » ('J')

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