Merge lp://staging/~jameinel/goose/no-update-deps into lp://staging/goose
Status: | Merged |
---|---|
Approved by: | John A Meinel |
Approved revision: | 106 |
Merged at revision: | 106 |
Proposed branch: | lp://staging/~jameinel/goose/no-update-deps |
Merge into: | lp://staging/goose |
Diff against target: |
19 lines (+1/-1) 1 file modified
test.py (+1/-1) |
To merge this branch: | bzr merge lp://staging/~jameinel/goose/no-update-deps |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju Engineering | Pending | ||
Review via email:
|
Commit message
test.py: don't update dependencies
There is no reason to update dependencies if we aren't running the
juju-core test suite anymore. This is what caused the juju-core test
suite to start failing because of the change in mgo that broke socket
timeouts. (We landed a goose branch which updated dependencies, which
brought in the 'broken' mgo, which then caused juju-core to stop
landing code.)
Description of the change
test.py: don't update dependencies
There is no reason to update dependencies if we aren't running the
juju-core test suite anymore. This is what caused the juju-core test
suite to start failing because of the change in mgo that broke socket
timeouts. (We landed a goose branch which updated dependencies, which
brought in the 'broken' mgo, which then caused juju-core to stop
landing code.)
Reviewers: mp+184506_ code.launchpad. net,
Message:
Please take a look.
Description:
test.py: don't update dependencies
There is no reason to update dependencies if we aren't running the
juju-core test suite anymore. This is what caused the juju-core test
suite to start failing because of the change in mgo that broke socket
timeouts. (We landed a goose branch which updated dependencies, which
brought in the 'broken' mgo, which then caused juju-core to stop
landing code.)
https:/ /code.launchpad .net/~jameinel/ goose/no- update- deps/+merge/ 184506
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/13379047/
Affected files (+3, -1 lines):
A [revision details]
M test.py
Index: [revision details] 20130906034601- 83yd6irnaucxwul 4
=== 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-
+New revision: <email address hidden>
Index: test.py tarmac_ log_dir( ) tarmac_ repository( ) juju_core_ dependencies( )
=== modified file 'test.py'
--- test.py 2013-04-25 13:02:56 +0000
+++ test.py 2013-09-09 06:23:33 +0000
@@ -99,7 +99,6 @@
"""Do all the bits of setup that need to happen for the tarmac bot."""
ensure_
create_
- ensure_
def setup_gopath():
tarmac_ setup(opts) juju_core_ dependencies( )
to_run. append( run_juju_ core_tests)
to_run. append( run_live_ tests)
@@ -199,6 +198,7 @@
to_run = [run_go_fmt, run_go_build, run_go_test]
if opts.juju_core:
+ ensure_
if opts.live: