juju-core

Merge lp:~rogpeppe/juju-core/430-do-not-upload-fake-tools-in-live-tests into lp:~go-bot/juju-core/trunk

  1. 430-do-not-upload-fake-tools-in-live-tests
  2. Merge into trunk
Proposed by Roger Peppe
Status: Work in progress
Proposed branch: lp:~rogpeppe/juju-core/430-do-not-upload-fake-tools-in-live-tests
Merge into: lp:~go-bot/juju-core/trunk
Diff against target: 53 lines (+0/-12)
2 files modified
environs/jujutest/livetests.go (+0/-4)
provider/ec2/live_test.go (+0/-8)
To merge this branch: bzr merge lp:~rogpeppe/juju-core/430-do-not-upload-fake-tools-in-live-tests
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+188844@code.launchpad.net

Description of the change

environs/jujutest: fix jujud upload in live tests

It shouldn't be fake - state is shared between tests
in the live tests.

https://codereview.appspot.com/14264044/

To post a comment you must log in.
lp:~rogpeppe/juju-core/430-do-not-upload-fake-tools-in-live-tests updated
1929. By Roger Peppe

provider/ec2: remove UploadFakeTools from live tests

Unmerged revisions

1929. By Roger Peppe

provider/ec2: remove UploadFakeTools from live tests

1928. By Roger Peppe

environs/jujutest: don't upload fake tools in live tests

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'environs/jujutest/livetests.go'
2--- environs/jujutest/livetests.go 2013-10-02 10:39:12 +0000
3+++ environs/jujutest/livetests.go 2013-10-02 14:41:31 +0000
4@@ -136,7 +136,6 @@
5 _, err := sync.Upload(t.Env.Storage(), nil, config.DefaultSeries)
6 c.Assert(err, gc.IsNil)
7 }
8- envtesting.UploadFakeTools(c, t.Env.Storage())
9 err := bootstrap.Bootstrap(t.Env, cons)
10 c.Assert(err, gc.IsNil)
11 t.bootstrapped = true
12@@ -178,7 +177,6 @@
13 // that it does not assume a pristine environment.
14 func (t *LiveTests) TestStartStop(c *gc.C) {
15 t.PrepareOnce(c)
16- envtesting.UploadFakeTools(c, t.Env.Storage())
17
18 inst, _ := testing.AssertStartInstance(c, t.Env, "0")
19 c.Assert(inst, gc.NotNil)
20@@ -232,7 +230,6 @@
21
22 func (t *LiveTests) TestPorts(c *gc.C) {
23 t.PrepareOnce(c)
24- envtesting.UploadFakeTools(c, t.Env.Storage())
25
26 inst1, _ := testing.AssertStartInstance(c, t.Env, "1")
27 c.Assert(inst1, gc.NotNil)
28@@ -321,7 +318,6 @@
29
30 func (t *LiveTests) TestGlobalPorts(c *gc.C) {
31 t.PrepareOnce(c)
32- envtesting.UploadFakeTools(c, t.Env.Storage())
33
34 // Change configuration.
35 oldConfig := t.Env.Config()
36
37=== modified file 'provider/ec2/live_test.go'
38--- provider/ec2/live_test.go 2013-09-30 19:40:06 +0000
39+++ provider/ec2/live_test.go 2013-10-02 14:41:31 +0000
40@@ -78,14 +78,6 @@
41
42 func (t *LiveTests) SetUpSuite(c *gc.C) {
43 t.LoggingSuite.SetUpSuite(c)
44- // TODO: Share code from jujutest.LiveTests for creating environment
45- e, err := environs.NewFromAttrs(t.TestConfig)
46- c.Assert(err, gc.IsNil)
47-
48- // Put some fake tools in place so that tests that are simply
49- // starting instances without any need to check if those instances
50- // are running will find them in the public bucket.
51- envtesting.UploadFakeTools(c, e.Storage())
52 t.LiveTests.SetUpSuite(c)
53 }
54

Subscribers

People subscribed via source and target branches

to status/vote changes: