Adopted needs-upgrade change of Python code

state/state_test.go

 // launchpad.net/juju/go/state
 //
 // Copyright (c) 2011-2012 Canonical Ltd.
 package state_test
 
 import (
         "fmt"
         . "launchpad.net/gocheck"
         "launchpad.net/gozk/zookeeper"
         "launchpad.net/juju/go/charm"
@@ skipping 815 matching lines @@
         c.Assert(err, IsNil)
         c.Assert(needsUpgrade, DeepEquals, &state.NeedsUpgrade{true, true})
 
         // Can be set forced multiple times.
         err = unit.SetNeedsUpgrade(true)
         c.Assert(err, IsNil)
         needsUpgrade, err = unit.NeedsUpgrade()
         c.Assert(err, IsNil)
         c.Assert(needsUpgrade, DeepEquals, &state.NeedsUpgrade{true, true})
 
-        // Can't be set multipe with different force flag. (TODO)
+        // Can't be set multipe with different force flag.
         err = unit.SetNeedsUpgrade(false)
-        c.Assert(err, ErrorMatches, `unit upgrade already enabled: "wordpress/0"`)
+        c.Assert(err, ErrorMatches, `upgrade already enabled for unit "wordpress/0"`)
 }
 
 func (s *StateSuite) TestGetSetClearResolved(c *C) {
         // Check that setting and clearing the resolved setting on a unit works.
         dummy, _ := addDummyCharm(c, s.st)
         wordpress, err := s.st.AddService("wordpress", dummy)
         c.Assert(err, IsNil)
         unit, err := wordpress.AddUnit()
         c.Assert(err, IsNil)
 
@@ skipping 130 matching lines @@
         alive, err = unit.AgentAlive()
         c.Assert(err, IsNil)
         c.Assert(alive, Equals, true)
 
         pinger.Kill()
 
         alive, err = unit.AgentAlive()
         c.Assert(err, IsNil)
         c.Assert(alive, Equals, false)
 }