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

Unified Diff: environs/ec2/local_test.go

Issue 6347044: environs/ec2: bootstrap (Closed)
Patch Set: environs/ec2: bootstrap Created 11 years, 8 months ago
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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « environs/ec2/live_test.go ('k') | environs/jujutest/livetests.go » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: environs/ec2/local_test.go
=== modified file 'environs/ec2/local_test.go'
--- environs/ec2/local_test.go 2012-07-09 05:58:27 +0000
+++ environs/ec2/local_test.go 2012-07-10 08:23:54 +0000
@@ -13,7 +13,8 @@
"launchpad.net/juju-core/environs/ec2"
"launchpad.net/juju-core/environs/jujutest"
"launchpad.net/juju-core/state"
- "launchpad.net/juju-core/testing"
+ "launchpad.net/juju-core/state/testing"
+ coretesting "launchpad.net/juju-core/testing"
"launchpad.net/juju-core/version"
"strings"
)
@@ -61,7 +62,8 @@
// localLiveSuite runs tests from LiveTests using a fake
// EC2 server that runs within the test process itself.
type localLiveSuite struct {
- testing.LoggingSuite
+ coretesting.LoggingSuite
+ testing.StateSuite
LiveTests
srv localServer
env environs.Environ
@@ -130,9 +132,7 @@
c.Logf("putting fake tools at %v", path)
toolsContents := "tools archive, honest guv"
err := s.Put(path, strings.NewReader(toolsContents), int64(len(toolsContents)))
- if err != nil {
- c.Fatal(err)
- }
+ c.Assert(err, IsNil)
}
// addSpice adds some "spice" to the local server
@@ -163,7 +163,8 @@
// accessed by using the "test" region, which is changed to point to the
// network address of the local server.
type localServerSuite struct {
- testing.LoggingSuite
+ coretesting.LoggingSuite
+ testing.StateSuite
jujutest.Tests
srv localServer
env environs.Environ
« no previous file with comments | « environs/ec2/live_test.go ('k') | environs/jujutest/livetests.go » ('j') | no next file with comments »

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