Merge lp://staging/~jameinel/goose/no-update-deps into lp://staging/goose

Proposed by John A Meinel
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
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+184506@code.staging.launchpad.net

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.)

https://codereview.appspot.com/13379047/

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.)

https://codereview.appspot.com/13379047/

To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote :

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]
=== 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-20130906034601-83yd6irnaucxwul4
+New revision: <email address hidden>

Index: test.py
=== 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_tarmac_log_dir()
      create_tarmac_repository()
- ensure_juju_core_dependencies()

  def setup_gopath():
@@ -199,6 +198,7 @@
          tarmac_setup(opts)
      to_run = [run_go_fmt, run_go_build, run_go_test]
      if opts.juju_core:
+ ensure_juju_core_dependencies()
          to_run.append(run_juju_core_tests)
      if opts.live:
          to_run.append(run_live_tests)

Revision history for this message
Frank Mueller (themue) wrote :

LGTM and good to know that the reason of the timeouts is found.

https://codereview.appspot.com/13379047/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches