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

Side by Side Diff: state/machine_test.go

Issue 6564054: state: make Refresh return NotFoundError
Patch Set: state: make Refresh return NotFoundError Created 11 years, 6 months ago
Left:
Right:
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 unified diff | Download patch
« no previous file with comments | « state/machine.go ('k') | state/relation.go » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 package state_test 1 package state_test
2 2
3 import ( 3 import (
4 . "launchpad.net/gocheck" 4 . "launchpad.net/gocheck"
5 "launchpad.net/juju-core/state" 5 "launchpad.net/juju-core/state"
6 "launchpad.net/juju-core/version" 6 "launchpad.net/juju-core/version"
7 "sort" 7 "sort"
8 "time" 8 "time"
9 ) 9 )
10 10
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 err = m0.SetInstanceId("umbrella/0") 144 err = m0.SetInstanceId("umbrella/0")
145 c.Assert(err, IsNil) 145 c.Assert(err, IsNil)
146 newId, _ := m0.InstanceId() 146 newId, _ := m0.InstanceId()
147 147
148 m1Id, _ := m1.InstanceId() 148 m1Id, _ := m1.InstanceId()
149 c.Assert(m1Id, Equals, oldId) 149 c.Assert(m1Id, Equals, oldId)
150 err = m1.Refresh() 150 err = m1.Refresh()
151 c.Assert(err, IsNil) 151 c.Assert(err, IsNil)
152 m1Id, _ = m1.InstanceId() 152 m1Id, _ = m1.InstanceId()
153 c.Assert(m1Id, Equals, newId) 153 c.Assert(m1Id, Equals, newId)
154
155 err = m0.EnsureDead()
156 c.Assert(err, IsNil)
157 err = s.State.RemoveMachine(m0.Id())
158 c.Assert(err, IsNil)
159 err = m0.Refresh()
160 c.Assert(state.IsNotFound(err), Equals, true)
154 } 161 }
155 162
156 func (s *MachineSuite) TestRefreshWhenNotAlive(c *C) { 163 func (s *MachineSuite) TestRefreshWhenNotAlive(c *C) {
157 // Refresh should work regardless of liveness status. 164 // Refresh should work regardless of liveness status.
158 m := s.machine 165 m := s.machine
159 err := m.SetInstanceId("foo") 166 err := m.SetInstanceId("foo")
160 c.Assert(err, IsNil) 167 c.Assert(err, IsNil)
161 168
162 testWhenDying(c, s.machine, noErr, noErr, func() error { 169 testWhenDying(c, s.machine, noErr, noErr, func() error {
163 return m.Refresh() 170 return m.Refresh()
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 for _, g := range change.Added { 549 for _, g := range change.Added {
543 got = append(got, g.Name()) 550 got = append(got, g.Name())
544 } 551 }
545 c.Assert(got, DeepEquals, added) 552 c.Assert(got, DeepEquals, added)
546 got = nil 553 got = nil
547 for _, g := range change.Removed { 554 for _, g := range change.Removed {
548 got = append(got, g.Name()) 555 got = append(got, g.Name())
549 } 556 }
550 c.Assert(got, DeepEquals, removed) 557 c.Assert(got, DeepEquals, removed)
551 } 558 }
OLDNEW
« no previous file with comments | « state/machine.go ('k') | state/relation.go » ('j') | no next file with comments »

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