juju-core

Merge lp:~thumper/juju-core/bzr-isolation into lp:~go-bot/juju-core/trunk

  1. bzr-isolation
  2. Merge into trunk
Proposed by Tim Penhey
Status: Merged
Approved by: Tim Penhey
Approved revision: no longer in the source branch.
Merged at revision: 2513
Proposed branch: lp:~thumper/juju-core/bzr-isolation
Merge into: lp:~go-bot/juju-core/trunk
Diff against target: 45 lines (+17/-0)
1 file modified
bzr/bzr_test.go (+17/-0)
To merge this branch: bzr merge lp:~thumper/juju-core/bzr-isolation
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+213397@code.launchpad.net

Commit message

Isolate the bzr tests from the environment

The tests fail if the user running the tests has
not told bzr who they are using 'bzr whoami'. This
test isolates that behaviour.

https://codereview.appspot.com/82250045/

Description of the change

Isolate the bzr tests from the environment

The tests fail if the user running the tests has
not told bzr who they are using 'bzr whoami'. This
test isolates that behaviour.

https://codereview.appspot.com/82250045/

To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :

Reviewers: mp+213397_code.launchpad.net,

Message:
Please take a look.

Description:
Isolate the bzr tests from the environment

The tests fail if the user running the tests has
not told bzr who they are using 'bzr whoami'. This
test isolates that behaviour.

https://code.launchpad.net/~thumper/juju-core/bzr-isolation/+merge/213397

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/82250045/

Affected files (+19, -0 lines):
   A [revision details]
   M bzr/bzr_test.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20140330221944-tt65zj7hl6967aad
+New revision: <email address hidden>

Index: bzr/bzr_test.go
=== modified file 'bzr/bzr_test.go'
--- bzr/bzr_test.go 2013-08-19 11:17:19 +0000
+++ bzr/bzr_test.go 2014-03-31 01:56:29 +0000
@@ -4,13 +4,16 @@
  package bzr_test

  import (
+ "io/ioutil"
   "os"
   "os/exec"
+ "path/filepath"
   "testing"

   gc "launchpad.net/gocheck"

   "launchpad.net/juju-core/bzr"
+ "launchpad.net/juju-core/testing/testbase"
  )

  func Test(t *testing.T) {
@@ -20,10 +23,24 @@
  var _ = gc.Suite(&BzrSuite{})

  type BzrSuite struct {
+ testbase.LoggingSuite
   b *bzr.Branch
  }

+const bzr_config = `[DEFAULT]
+email = testing <email address hidden>
+`
+
  func (s *BzrSuite) SetUpTest(c *gc.C) {
+ s.LoggingSuite.SetUpTest(c)
+ bzrdir := c.MkDir()
+ s.PatchEnvironment("BZR_HOME", bzrdir)
+ err := os.Mkdir(filepath.Join(bzrdir, ".bazaar"), 0755)
+ c.Assert(err, gc.IsNil)
+ err = ioutil.WriteFile(
+ filepath.Join(bzrdir, ".bazaar", "bazaar.conf"),
+ []byte(bzr_config), 0644)
+ c.Assert(err, gc.IsNil)
   s.b = bzr.New(c.MkDir())
   c.Assert(s.b.Init(), gc.IsNil)
  }

Revision history for this message
Dave Cheney (dave-cheney) wrote :

LGTM. Very nice

https://codereview.appspot.com/82250045/

Revision history for this message
Go Bot (go-bot) wrote :
Download full text (62.2 KiB)

The attempt to merge lp:~thumper/juju-core/bzr-isolation into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core 0.012s
ok launchpad.net/juju-core/agent 1.066s
ok launchpad.net/juju-core/agent/mongo 0.577s
ok launchpad.net/juju-core/agent/tools 0.192s
ok launchpad.net/juju-core/bzr 4.929s
ok launchpad.net/juju-core/cert 3.212s
ok launchpad.net/juju-core/charm 0.446s
? launchpad.net/juju-core/charm/hooks [no test files]
? launchpad.net/juju-core/charm/testing [no test files]
ok launchpad.net/juju-core/cloudinit 0.026s
ok launchpad.net/juju-core/cloudinit/sshinit 0.733s
ok launchpad.net/juju-core/cmd 0.171s
ok launchpad.net/juju-core/cmd/charm-admin 0.744s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/juju 196.211s
ok launchpad.net/juju-core/cmd/jujud 64.804s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 10.302s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/cmd/plugins/local 0.176s
? launchpad.net/juju-core/cmd/plugins/local/juju-local [no test files]
ok launchpad.net/juju-core/constraints 0.029s
ok launchpad.net/juju-core/container 0.038s
ok launchpad.net/juju-core/container/factory 0.034s
ok launchpad.net/juju-core/container/kvm 0.197s
ok launchpad.net/juju-core/container/kvm/mock 0.028s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 4.323s
? launchpad.net/juju-core/container/lxc/mock [no test files]
? launchpad.net/juju-core/container/lxc/testing [no test files]
? launchpad.net/juju-core/container/testing [no test files]
ok launchpad.net/juju-core/downloader 5.242s
ok launchpad.net/juju-core/environs 2.394s
ok launchpad.net/juju-core/environs/bootstrap 10.040s
ok launchpad.net/juju-core/environs/cloudinit 0.469s
ok launchpad.net/juju-core/environs/config 2.182s
ok launchpad.net/juju-core/environs/configstore 0.032s
ok launchpad.net/juju-core/environs/filestorage 0.030s
ok launchpad.net/juju-core/environs/httpstorage 0.642s
ok launchpad.net/juju-core/environs/imagemetadata 0.482s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.040s
ok launchpad.net/juju-core/environs/jujutest 0.189s
ok launchpad.net/juju-core/environs/manual 11.480s
ok launchpad.net/juju-core/environs/simplestreams 0.266s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 0.897s
ok launchpad.net/juju-core/environs/storage 0.783s
ok launchpad.net/juju-core/environs/sync 41.394s
ok launchpad.net/juju-core/environs/testing 0.137s
ok launchpad.net/juju-core/environs/tools 4.508s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/errors 0.012s
ok launchpad.net/juju-core/instance 0.020s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/juju-core/juju 18.656s
ok launchpad.net/juju-core/juju/arch 0.014s
ok l...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzr/bzr_test.go'
2--- bzr/bzr_test.go 2013-08-19 11:17:19 +0000
3+++ bzr/bzr_test.go 2014-03-31 01:59:25 +0000
4@@ -4,13 +4,16 @@
5 package bzr_test
6
7 import (
8+ "io/ioutil"
9 "os"
10 "os/exec"
11+ "path/filepath"
12 "testing"
13
14 gc "launchpad.net/gocheck"
15
16 "launchpad.net/juju-core/bzr"
17+ "launchpad.net/juju-core/testing/testbase"
18 )
19
20 func Test(t *testing.T) {
21@@ -20,10 +23,24 @@
22 var _ = gc.Suite(&BzrSuite{})
23
24 type BzrSuite struct {
25+ testbase.LoggingSuite
26 b *bzr.Branch
27 }
28
29+const bzr_config = `[DEFAULT]
30+email = testing <test@example.com>
31+`
32+
33 func (s *BzrSuite) SetUpTest(c *gc.C) {
34+ s.LoggingSuite.SetUpTest(c)
35+ bzrdir := c.MkDir()
36+ s.PatchEnvironment("BZR_HOME", bzrdir)
37+ err := os.Mkdir(filepath.Join(bzrdir, ".bazaar"), 0755)
38+ c.Assert(err, gc.IsNil)
39+ err = ioutil.WriteFile(
40+ filepath.Join(bzrdir, ".bazaar", "bazaar.conf"),
41+ []byte(bzr_config), 0644)
42+ c.Assert(err, gc.IsNil)
43 s.b = bzr.New(c.MkDir())
44 c.Assert(s.b.Init(), gc.IsNil)
45 }

Subscribers

People subscribed via source and target branches

to status/vote changes: