Merge lp://staging/~jameinel/juju-core/disable-testmanagestateservesapi-1219661 into lp://staging/~go-bot/juju-core/trunk

Reviewers: mp+183384_code.launchpad.net,

Message:
Please take a look.

Description:
cmd/jujud: Disable flaky test

TestManageStateServesAPI is failing about half the time on the bot. I'd
love to
have a fix, but until we do I don't want to reject peoples patches
incorrectly.

https://code.launchpad.net/~jameinel/juju-core/disable-testmanagestateservesapi-1219661/+merge/183384

(do not edit description out of merge proposal)

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

Affected files:
   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-20130902034049-oech4u0m5spe4r02
+New revision: <email address hidden>

Index: cmd/jujud/machine_test.go
=== modified file 'cmd/jujud/machine_test.go'
--- cmd/jujud/machine_test.go 2013-08-29 05:36:08 +0000
+++ cmd/jujud/machine_test.go 2013-09-02 07:28:00 +0000
@@ -374,7 +374,11 @@
   }
  }

-func (s *MachineSuite) TestManageStateServesAPI(c *gc.C) {
+// 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) DONT_TestManageStateServesAPI(c *gc.C) {
   s.assertJobWithState(c, state.JobManageState, func(conf agent.Config,
agentState *state.State) {
    st, _, err := conf.OpenAPI(fastDialOpts)
    c.Assert(err, gc.IsNil)

LGTM

https://codereview.appspot.com/13253045/diff/1/cmd/jujud/machine_test.go
File cmd/jujud/machine_test.go (right):

https://codereview.appspot.com/13253045/diff/1/cmd/jujud/machine_test.go#newcode381
cmd/jujud/machine_test.go:381: func (s *MachineSuite)
DONT_TestManageStateServesAPI(c *gc.C) {
I think it would be better to use c.Skip, just so it's in everybody's
faces.

https://codereview.appspot.com/13253045/

Please take a look.

https://codereview.appspot.com/13253045/diff/1/cmd/jujud/machine_test.go
File cmd/jujud/machine_test.go (right):

https://codereview.appspot.com/13253045/diff/1/cmd/jujud/machine_test.go#newcode381
cmd/jujud/machine_test.go:381: func (s *MachineSuite)
DONT_TestManageStateServesAPI(c *gc.C) {
On 2013/09/02 08:27:00, axw1 wrote:
> I think it would be better to use c.Skip, just so it's in everybody's
faces.

Done.

https://codereview.appspot.com/13253045/