Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(267)

Unified Diff: worker/machiner/machiner_test.go

Issue 8667043: various: unify machine and unit status types (Closed)
Patch Set: various: unify machine and unit status types Created 10 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « worker/machiner/machiner.go ('k') | worker/provisioner/provisioner.go » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: worker/machiner/machiner_test.go
=== modified file 'worker/machiner/machiner_test.go'
--- worker/machiner/machiner_test.go 2013-04-11 11:18:03 +0000
+++ worker/machiner/machiner_test.go 2013-04-11 15:46:31 +0000
@@ -28,7 +28,7 @@
var _ = Suite(&MachinerSuite{})
-func (s *MachinerSuite) waitMachineStatus(c *C, m *state.Machine, expectStatus params.MachineStatus) {
+func (s *MachinerSuite) waitMachineStatus(c *C, m *state.Machine, expectStatus params.Status) {
timeout := time.After(worstCase)
for {
select {
@@ -68,7 +68,7 @@
status, info, err := m.Status()
c.Assert(err, IsNil)
- c.Assert(status, Equals, params.MachinePending)
+ c.Assert(status, Equals, params.StatusPending)
c.Assert(info, Equals, "")
alive, err := m.AgentAlive()
@@ -78,7 +78,7 @@
mr := machiner.NewMachiner(s.State, m.Id())
defer mr.Stop()
- s.waitMachineStatus(c, m, params.MachineStarted)
+ s.waitMachineStatus(c, m, params.StatusStarted)
s.State.Sync()
alive, err = m.AgentAlive()
@@ -92,7 +92,7 @@
mr := machiner.NewMachiner(s.State, m.Id())
defer mr.Stop()
c.Assert(m.Destroy(), IsNil)
- s.waitMachineStatus(c, m, params.MachineStopped)
+ s.waitMachineStatus(c, m, params.StatusStopped)
}
func (s *MachinerSuite) TestSetDead(c *C) {
« no previous file with comments | « worker/machiner/machiner.go ('k') | worker/provisioner/provisioner.go » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b