Merge lp:~cjohnston/ubuntu-ci-services-itself/fix-bzr-error into lp:ubuntu-ci-services-itself

[Chris Johnston]

Fix bzr error

======================================================================
ERROR: test_ensure_some_branches_are_not_pinned (__main__.TestUpdate)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "./juju-deployer/test_update.py", line 91, in setUp
    ('add', ('filename', 'f-id', 'file', 'content\n'))])
  File "/tmp/tmp.pjlTcFZxJd/local/lib/python2.7/site-packages/bzr-2.6.0-py2.7-linux-i686.egg/bzrlib/branchbuilder.py", line 259, in build_snapshot
    message_callback=message_callback)
  File "/tmp/tmp.pjlTcFZxJd/local/lib/python2.7/site-packages/bzr-2.6.0-py2.7-linux-i686.egg/bzrlib/branchbuilder.py", line 127, in _do_commit
    **kwargs)
  File "<string>", line 4, in commit_write_locked
  File "/tmp/tmp.pjlTcFZxJd/local/lib/python2.7/site-packages/bzr-2.6.0-py2.7-linux-i686.egg/bzrlib/mutabletree.py", line 211, in commit
    *args, **kwargs)
  File "/tmp/tmp.pjlTcFZxJd/local/lib/python2.7/site-packages/bzr-2.6.0-py2.7-linux-i686.egg/bzrlib/commit.py", line 290, in commit
    lossy=lossy)
  File "/tmp/tmp.pjlTcFZxJd/local/lib/python2.7/site-packages/bzr-2.6.0-py2.7-linux-i686.egg/bzrlib/cleanup.py", line 132, in run
    self.cleanups, self.func, self, *args, **kwargs)
  File "/tmp/tmp.pjlTcFZxJd/local/lib/python2.7/site-packages/bzr-2.6.0-py2.7-linux-i686.egg/bzrlib/cleanup.py", line 166, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/tmp/tmp.pjlTcFZxJd/local/lib/python2.7/site-packages/bzr-2.6.0-py2.7-linux-i686.egg/bzrlib/commit.py", line 410, in _commit
    rev_id, lossy=lossy)
  File "/tmp/tmp.pjlTcFZxJd/local/lib/python2.7/site-packages/bzr-2.6.0-py2.7-linux-i686.egg/bzrlib/branch.py", line 752, in get_commit_builder
    lossy)
  File "/tmp/tmp.pjlTcFZxJd/local/lib/python2.7/site-packages/bzr-2.6.0-py2.7-linux-i686.egg/bzrlib/vf_repository.py", line 1306, in get_commit_builder
    lossy)
  File "/tmp/tmp.pjlTcFZxJd/local/lib/python2.7/site-packages/bzr-2.6.0-py2.7-linux-i686.egg/bzrlib/repofmt/pack_repo.py", line 110, in __init__
    lossy=lossy)
  File "/tmp/tmp.pjlTcFZxJd/local/lib/python2.7/site-packages/bzr-2.6.0-py2.7-linux-i686.egg/bzrlib/vf_repository.py", line 117, in __init__
    revision_id, lossy)
  File "/tmp/tmp.pjlTcFZxJd/local/lib/python2.7/site-packages/bzr-2.6.0-py2.7-linux-i686.egg/bzrlib/repository.py", line 102, in __init__
    self._committer = self._config_stack.get('email')
  File "/tmp/tmp.pjlTcFZxJd/local/lib/python2.7/site-packages/bzr-2.6.0-py2.7-linux-i686.egg/bzrlib/config.py", line 3738, in get
    value = opt.get_default()
  File "/tmp/tmp.pjlTcFZxJd/local/lib/python2.7/site-packages/bzr-2.6.0-py2.7-linux-i686.egg/bzrlib/config.py", line 2414, in get_default
    value = self.default()
  File "/tmp/tmp.pjlTcFZxJd/local/lib/python2.7/site-packages/bzr-2.6.0-py2.7-linux-i686.egg/bzrlib/config.py", line 1598, in default_email
    raise errors.NoWhoami()
NoWhoami: Unable to determine your name.
Please, set your name with the 'whoami' command.
E.g. bzr whoami "Your Name <email address hidden>"

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:245
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/179/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/179/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:245
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/180/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/180/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:245
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/181/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/181/rebuild

review: Needs Fixing (continuous-integration)

[lp:~cjohnston/ubuntu-ci-services-itself/fix-bzr-error]

246. By Chris Johnston on 2014-02-19

Use env python for update.py

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:246
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/182/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/182/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:246
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/183/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/183/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:246
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/184/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/184/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:246
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/185/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/185/rebuild

review: Approve (continuous-integration)

[Francis Ginther (fginther)]

This fixes the current jenkins testing issue. There are still problems caused by pypi access (see other failures above), cjohnston is starting to work on this.

review: Approve

=== modified file 'juju-deployer/test_update.py'
--- juju-deployer/test_update.py	2014-02-17 15:34:05 +0000
+++ juju-deployer/test_update.py	2014-02-19 16:11:48 +0000
@@ -23,6 +23,8 @@
 import unittest
 import yaml
 
+from ucitests import fixtures
+
 sys.path.append(os.path.abspath(os.path.dirname(sys.argv[0])))
 import update
 
@@ -80,6 +82,7 @@
     def setUp(self):
         self.temp_dir = tempfile.mkdtemp()
         self.addCleanup(lambda: shutil.rmtree(self.temp_dir))
+        fixtures.override_env(self, 'BZR_EMAIL', '[e-mail]')
         # We need a real branch with at least 2 revisions (so we can check out
         # of date references)
         builder = branchbuilder.BranchBuilder(

=== modified file 'juju-deployer/update.py'
--- juju-deployer/update.py	2014-02-17 10:13:29 +0000
+++ juju-deployer/update.py	2014-02-19 16:11:48 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Ubuntu CI Engine
 # Copyright 2014 Canonical Ltd.