Left: | ||
Right: |
OLD | NEW |
---|---|
1 package ec2_test | 1 package ec2_test |
2 | 2 |
3 import ( | 3 import ( |
4 "crypto/rand" | 4 "crypto/rand" |
5 "fmt" | 5 "fmt" |
6 "io" | 6 "io" |
7 "io/ioutil" | 7 "io/ioutil" |
8 amzec2 "launchpad.net/goamz/ec2" | 8 amzec2 "launchpad.net/goamz/ec2" |
9 . "launchpad.net/gocheck" | 9 . "launchpad.net/gocheck" |
10 "launchpad.net/juju-core/environs" | 10 "launchpad.net/juju-core/environs" |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
48 if err != nil { | 48 if err != nil { |
49 panic(fmt.Errorf("cannot parse amazon tests config data: %v", er r)) | 49 panic(fmt.Errorf("cannot parse amazon tests config data: %v", er r)) |
50 } | 50 } |
51 for _, name := range envs.Names() { | 51 for _, name := range envs.Names() { |
52 Suite(&LiveTests{ | 52 Suite(&LiveTests{ |
53 LiveTests: jujutest.LiveTests{ | 53 LiveTests: jujutest.LiveTests{ |
54 Environs: envs, | 54 Environs: envs, |
55 Name: name, | 55 Name: name, |
56 ConsistencyDelay: 5 * time.Second, | 56 ConsistencyDelay: 5 * time.Second, |
57 CanOpenState: true, | 57 CanOpenState: true, |
58 HasProvisioner: false, // TODO(dfc) waiting on juju/conn.Depoy | |
rog
2012/07/10 08:07:56
s/Depoy/Deploy/
dfc
2012/07/10 08:24:47
Done.
| |
58 }, | 59 }, |
59 }) | 60 }) |
60 } | 61 } |
61 } | 62 } |
62 | 63 |
63 // LiveTests contains tests that can be run against the Amazon servers. | 64 // LiveTests contains tests that can be run against the Amazon servers. |
64 // Each test runs using the same ec2 connection. | 65 // Each test runs using the same ec2 connection. |
65 type LiveTests struct { | 66 type LiveTests struct { |
66 testing.LoggingSuite | 67 testing.LoggingSuite |
67 jujutest.LiveTests | 68 jujutest.LiveTests |
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
363 } | 364 } |
364 | 365 |
365 func hasSecurityGroup(r amzec2.Reservation, g amzec2.SecurityGroup) bool { | 366 func hasSecurityGroup(r amzec2.Reservation, g amzec2.SecurityGroup) bool { |
366 for _, rg := range r.SecurityGroups { | 367 for _, rg := range r.SecurityGroups { |
367 if rg.Id == g.Id { | 368 if rg.Id == g.Id { |
368 return true | 369 return true |
369 } | 370 } |
370 } | 371 } |
371 return false | 372 return false |
372 } | 373 } |
OLD | NEW |