Merge lp:~axwalk/juju-core/unskip-testmanagenenvironservesapi into lp:~go-bot/juju-core/trunk

[Andrew Wilkins]

cmd/jujud: unskip TestManageEnvironServesAPI

This test has been skipped due to unreliability,
but nobody ever went back and looked at fixing
it. I can't see anything obviously wrong, and I
can't reproduce the failure on trunk. Reenabling
for now, will revert this change if the bot
starts failing again.

https://codereview.appspot.com/91700043/

cmd/jujud: unskip TestManageEnvironServesAPI

This test has been skipped due to unreliability,
but nobody ever went back and looked at fixing
it. I can't see anything obviously wrong, and I
can't reproduce the failure on trunk. Reenabling
for now, will revert this change if the bot
starts failing again.

https://codereview.appspot.com/91700043/

[Andrew Wilkins (axwalk)]

Reviewers: mp+220900_code.launchpad.net,

Message:
Please take a look.

Description:
cmd/jujud: unskip TestManageEnvironServesAPI

This test has been skipped due to unreliability,
but nobody ever went back and looked at fixing
it. I can't see anything obviously wrong, and I
can't reproduce the failure on trunk. Reenabling
for now, will revert this change if the bot
starts failing again.

https://code.launchpad.net/~axwalk/juju-core/unskip-testmanagenenvironservesapi/+merge/220900

(do not edit description out of merge proposal)

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

Affected files (+2, -5 lines):
   A [revision details]
   M cmd/jujud/machine_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-20140526021316-icc7zvaqrxmvlzzs
+New revision: <email address hidden>

Index: cmd/jujud/machine_test.go
=== modified file 'cmd/jujud/machine_test.go'
--- cmd/jujud/machine_test.go 2014-05-23 11:23:30 +0000
+++ cmd/jujud/machine_test.go 2014-05-26 05:55:25 +0000
@@ -676,12 +676,7 @@
   s.waitStopped(c, job, a, done)
  }

-// TODO(jam): 2013-09-02 http://pad.lv/1219661
-// This test has been failing regularly on the Bot. Until someone fixes it
so
-// it doesn't crash, it isn't worth having as we can't tell when someone
-// actually breaks something.
  func (s *MachineSuite) TestManageEnvironServesAPI(c *gc.C) {
- c.Skip("does not pass reliably on the bot (http://pad.lv/1219661")
   s.assertJobWithState(c, state.JobManageEnviron, func(conf agent.Config,
agentState *state.State) {
    st, err := api.Open(conf.APIInfo(), fastDialOpts)
    c.Assert(err, gc.IsNil)

[William Reade (fwereade)]

LGTM, speculatively, but please be careful to land it when you'll be
around for a few hours to watch what happens. The most annoying
possibility is that it'll pass randomly the one time it needs to get
into trunk, and I'd like to back it out asap if it's a problem.

https://codereview.appspot.com/91700043/

[Andrew Wilkins (axwalk)]

On 2014/05/26 06:23:34, fwereade wrote:
> LGTM, speculatively, but please be careful to land it when you'll be
around for
> a few hours to watch what happens. The most annoying possibility is
that it'll
> pass randomly the one time it needs to get into trunk, and I'd like to
back it
> out asap if it's a problem.

Will be around for a few hours yet.

https://codereview.appspot.com/91700043/

=== modified file 'cmd/jujud/machine_test.go'
--- cmd/jujud/machine_test.go	2014-05-23 11:23:30 +0000
+++ cmd/jujud/machine_test.go	2014-05-26 05:58:56 +0000
@@ -676,12 +676,7 @@
 	s.waitStopped(c, job, a, done)
 }
 
-// TODO(jam): 2013-09-02 http://pad.lv/1219661
-// This test has been failing regularly on the Bot. Until someone fixes it so
-// it doesn't crash, it isn't worth having as we can't tell when someone
-// actually breaks something.
 func (s *MachineSuite) TestManageEnvironServesAPI(c *gc.C) {
-	c.Skip("does not pass reliably on the bot (http://pad.lv/1219661")
 	s.assertJobWithState(c, state.JobManageEnviron, func(conf agent.Config, agentState *state.State) {
 		st, err := api.Open(conf.APIInfo(), fastDialOpts)
 		c.Assert(err, gc.IsNil)