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

Delta Between Two Patch Sets: ec2_test.go

Issue 5433056: Add ec2test package for fake EC2 server.
Left Patch Set: - Created 13 years, 4 months ago
Right Patch Set: - Created 13 years, 4 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:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « ec2.go ('k') | ec2i_test.go » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 package ec2_test 1 package ec2_test
2 2
3 import ( 3 import (
4 "launchpad.net/goamz/aws" 4 "launchpad.net/goamz/aws"
5 "launchpad.net/goamz/ec2" 5 "launchpad.net/goamz/ec2"
6 . "launchpad.net/gocheck" 6 . "launchpad.net/gocheck"
7 ) 7 )
8 8
9 var _ = Suite(&S{}) 9 var _ = Suite(&S{})
10 10
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 filter.Add("key2", "value2", "value3") 212 filter.Add("key2", "value2", "value3")
213 213
214 resp, err := s.ec2.Instances([]string{"i-1", "i-2"}, filter) 214 resp, err := s.ec2.Instances([]string{"i-1", "i-2"}, filter)
215 215
216 req := testServer.WaitRequest() 216 req := testServer.WaitRequest()
217 c.Assert(req.Form["Action"], Equals, []string{"DescribeInstances"}) 217 c.Assert(req.Form["Action"], Equals, []string{"DescribeInstances"})
218 c.Assert(req.Form["InstanceId.1"], Equals, []string{"i-1"}) 218 c.Assert(req.Form["InstanceId.1"], Equals, []string{"i-1"})
219 c.Assert(req.Form["InstanceId.2"], Equals, []string{"i-2"}) 219 c.Assert(req.Form["InstanceId.2"], Equals, []string{"i-2"})
220 c.Assert(req.Form["Filter.1.Name"], Equals, []string{"key1"}) 220 c.Assert(req.Form["Filter.1.Name"], Equals, []string{"key1"})
221 c.Assert(req.Form["Filter.1.Value.1"], Equals, []string{"value1"}) 221 c.Assert(req.Form["Filter.1.Value.1"], Equals, []string{"value1"})
222 » c.Assert(len(req.Form["Filter.1.Value.2"]), Equals, 0) 222 » c.Assert(req.Form["Filter.1.Value.2"], IsNil)
niemeyer 2011/12/01 17:06:58 IsNil
rog 2011/12/02 12:10:43 Done.
223 c.Assert(req.Form["Filter.2.Name"], Equals, []string{"key2"}) 223 c.Assert(req.Form["Filter.2.Name"], Equals, []string{"key2"})
224 c.Assert(req.Form["Filter.2.Value.1"], Equals, []string{"value2"}) 224 c.Assert(req.Form["Filter.2.Value.1"], Equals, []string{"value2"})
225 c.Assert(req.Form["Filter.2.Value.2"], Equals, []string{"value3"}) 225 c.Assert(req.Form["Filter.2.Value.2"], Equals, []string{"value3"})
226 226
227 c.Assert(err, IsNil) 227 c.Assert(err, IsNil)
228 c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE") 228 c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
229 c.Assert(len(resp.Reservations), Equals, 1) 229 c.Assert(len(resp.Reservations), Equals, 1)
230 } 230 }
231 231
232 func (s *S) TestCreateSecurityGroupExample(c *C) { 232 func (s *S) TestCreateSecurityGroupExample(c *C) {
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 g1 := resp.SecurityGroups[1] 272 g1 := resp.SecurityGroups[1]
273 c.Assert(g1.OwnerId, Equals, "999988887777") 273 c.Assert(g1.OwnerId, Equals, "999988887777")
274 c.Assert(g1.GroupName, Equals, "RangedPortsBySource") 274 c.Assert(g1.GroupName, Equals, "RangedPortsBySource")
275 c.Assert(g1.GroupDescr, Equals, "Group A") 275 c.Assert(g1.GroupDescr, Equals, "Group A")
276 c.Assert(len(g1.IPPerms), Equals, 1) 276 c.Assert(len(g1.IPPerms), Equals, 1)
277 277
278 g1ipp := g1.IPPerms[0] 278 g1ipp := g1.IPPerms[0]
279 c.Assert(g1ipp.Protocol, Equals, "tcp") 279 c.Assert(g1ipp.Protocol, Equals, "tcp")
280 c.Assert(g1ipp.FromPort, Equals, 6000) 280 c.Assert(g1ipp.FromPort, Equals, 6000)
281 c.Assert(g1ipp.ToPort, Equals, 7000) 281 c.Assert(g1ipp.ToPort, Equals, 7000)
282 » c.Assert(len(g1ipp.SourceIPs), Equals, 0) 282 » c.Assert(g1ipp.SourceIPs, IsNil)
niemeyer 2011/12/01 17:06:58 IsNil
rog 2011/12/02 12:10:43 Done.
283 } 283 }
284 284
285 func (s *S) TestDescribeSecurityGroupsExampleWithFilter(c *C) { 285 func (s *S) TestDescribeSecurityGroupsExampleWithFilter(c *C) {
286 testServer.PrepareResponse(200, nil, DescribeSecurityGroupsExample) 286 testServer.PrepareResponse(200, nil, DescribeSecurityGroupsExample)
287 287
288 filter := ec2.NewFilter() 288 filter := ec2.NewFilter()
289 filter.Add("ip-permission.protocol", "tcp") 289 filter.Add("ip-permission.protocol", "tcp")
290 filter.Add("ip-permission.from-port", "22") 290 filter.Add("ip-permission.from-port", "22")
291 filter.Add("ip-permission.to-port", "22") 291 filter.Add("ip-permission.to-port", "22")
292 filter.Add("ip-permission.group-name", "app_server_group", "database_gro up") 292 filter.Add("ip-permission.group-name", "app_server_group", "database_gro up")
(...skipping 21 matching lines...) Expand all
314 resp, err := s.ec2.SecurityGroups(nil, nil) 314 resp, err := s.ec2.SecurityGroups(nil, nil)
315 315
316 req := testServer.WaitRequest() 316 req := testServer.WaitRequest()
317 c.Assert(req.Form["Action"], Equals, []string{"DescribeSecurityGroups"}) 317 c.Assert(req.Form["Action"], Equals, []string{"DescribeSecurityGroups"})
318 318
319 c.Assert(err, IsNil) 319 c.Assert(err, IsNil)
320 c.Assert(len(resp.SecurityGroups), Equals, 1) 320 c.Assert(len(resp.SecurityGroups), Equals, 1)
321 c.Assert(len(resp.SecurityGroups[0].IPPerms), Equals, 2) 321 c.Assert(len(resp.SecurityGroups[0].IPPerms), Equals, 2)
322 322
323 ipp0 := resp.SecurityGroups[0].IPPerms[0] 323 ipp0 := resp.SecurityGroups[0].IPPerms[0]
324 » c.Assert(len(ipp0.SourceIPs), Equals, 0) 324 » c.Assert(ipp0.SourceIPs, IsNil)
325 c.Assert(len(ipp0.SourceGroups), Equals, 1) 325 c.Assert(len(ipp0.SourceGroups), Equals, 1)
326 c.Assert(ipp0.SourceGroups[0].OwnerId, Equals, "12345") 326 c.Assert(ipp0.SourceGroups[0].OwnerId, Equals, "12345")
327 c.Assert(ipp0.SourceGroups[0].GroupName, Equals, "default") 327 c.Assert(ipp0.SourceGroups[0].GroupName, Equals, "default")
328 328
329 ipp1 := resp.SecurityGroups[0].IPPerms[1] 329 ipp1 := resp.SecurityGroups[0].IPPerms[1]
330 » c.Assert(len(ipp0.SourceIPs), Equals, 0) 330 » c.Assert(ipp0.SourceIPs, IsNil)
331 c.Assert(len(ipp0.SourceGroups), Equals, 1) 331 c.Assert(len(ipp0.SourceGroups), Equals, 1)
332 c.Assert(ipp1.SourceGroups[0].OwnerId, Equals, "12345") 332 c.Assert(ipp1.SourceGroups[0].OwnerId, Equals, "12345")
333 c.Assert(ipp1.SourceGroups[0].GroupName, Equals, "default") 333 c.Assert(ipp1.SourceGroups[0].GroupName, Equals, "default")
334 } 334 }
335 335
336 func (s *S) TestDeleteSecurityGroupExample(c *C) { 336 func (s *S) TestDeleteSecurityGroupExample(c *C) {
337 testServer.PrepareResponse(200, nil, DeleteSecurityGroupExample) 337 testServer.PrepareResponse(200, nil, DeleteSecurityGroupExample)
338 338
339 resp, err := s.ec2.DeleteSecurityGroup("websrv") 339 resp, err := s.ec2.DeleteSecurityGroup("websrv")
340 340
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 c.Assert(req.Form["GroupName"], Equals, []string{"websrv"}) 388 c.Assert(req.Form["GroupName"], Equals, []string{"websrv"})
389 c.Assert(req.Form["IpPermissions.1.IpProtocol"], Equals, []string{"tcp"} ) 389 c.Assert(req.Form["IpPermissions.1.IpProtocol"], Equals, []string{"tcp"} )
390 c.Assert(req.Form["IpPermissions.1.FromPort"], Equals, []string{"80"}) 390 c.Assert(req.Form["IpPermissions.1.FromPort"], Equals, []string{"80"})
391 c.Assert(req.Form["IpPermissions.1.ToPort"], Equals, []string{"81"}) 391 c.Assert(req.Form["IpPermissions.1.ToPort"], Equals, []string{"81"})
392 c.Assert(req.Form["IpPermissions.1.Groups.1.UserId"], Equals, []string{" 999988887777"}) 392 c.Assert(req.Form["IpPermissions.1.Groups.1.UserId"], Equals, []string{" 999988887777"})
393 c.Assert(req.Form["IpPermissions.1.Groups.1.GroupName"], Equals, []strin g{"OtherAccountGroup"}) 393 c.Assert(req.Form["IpPermissions.1.Groups.1.GroupName"], Equals, []strin g{"OtherAccountGroup"})
394 394
395 c.Assert(err, IsNil) 395 c.Assert(err, IsNil)
396 c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE") 396 c.Assert(resp.RequestId, Equals, "59dbff89-35bd-4eac-99ed-be587EXAMPLE")
397 } 397 }
LEFTRIGHT

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