Reinstate the state status test

Once we've removed the model-cache we can use state to check the status.

api/watcher/watcher_test.go

@@ -485,7 +485,7 @@ func (s *watcherSuite) setupOfferStatusWatch(
 	}
 
 	// Initial event.
-	assertChange(status.Unknown, "")
+	assertChange(status.Unset, "")
 	return assertChange, assertNoChange, stop
 }
 
@@ -496,13 +496,10 @@ func (s *watcherSuite) TestOfferStatusWatcher(c *gc.C) {
 	assertChange, assertNoChange, stop := s.setupOfferStatusWatch(c)
 	defer stop()
 
-	// watcher needs to come from model cache: https://bugs.launchpad.net/juju/+bug/1883625"
-	// Until then, the status checking is bypassed.
-	var err error
-	// err := mysql.SetStatus(status.StatusInfo{Status: status.Unknown, Message: "another message"})
-	// c.Assert(err, jc.ErrorIsNil)
+	err := mysql.SetStatus(status.StatusInfo{Status: status.Unknown, Message: "another message"})
+	c.Assert(err, jc.ErrorIsNil)
 
-	// assertChange(status.Waiting, "another message")
+	assertChange(status.Unknown, "another message")
 
 	// Removing offer and application both trigger events.
 	offers := state.NewApplicationOffers(s.State)