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

Side by Side Diff: state/service_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
OLDNEW
1 package state_test 1 package state_test
2 2
3 import ( 3 import (
4 "fmt" 4 "fmt"
5 . "launchpad.net/gocheck" 5 . "launchpad.net/gocheck"
6 "launchpad.net/juju-core/charm" 6 "launchpad.net/juju-core/charm"
7 "launchpad.net/juju-core/state" 7 "launchpad.net/juju-core/state"
8 "sort" 8 "sort"
9 "time" 9 "time"
10 ) 10 )
(...skipping 26 matching lines...) Expand all
37 ch, force, err1 := s.service.Charm() 37 ch, force, err1 := s.service.Charm()
38 c.Assert(err1, IsNil) 38 c.Assert(err1, IsNil)
39 c.Assert(ch.URL(), DeepEquals, wp.URL()) 39 c.Assert(ch.URL(), DeepEquals, wp.URL())
40 c.Assert(force, Equals, true) 40 c.Assert(force, Equals, true)
41 41
42 testWhenDying(c, s.service, notAliveErr, notAliveErr, func() error { 42 testWhenDying(c, s.service, notAliveErr, notAliveErr, func() error {
43 return s.service.SetCharm(wp, true) 43 return s.service.SetCharm(wp, true)
44 }) 44 })
45 } 45 }
46 46
47 func (s *ServiceSuite) TestServiceRefesh(c *C) { 47 func (s *ServiceSuite) TestServiceRefresh(c *C) {
48 s1, err := s.State.Service(s.service.Name()) 48 s1, err := s.State.Service(s.service.Name())
49 c.Assert(err, IsNil) 49 c.Assert(err, IsNil)
50 50
51 err = s.service.SetCharm(s.charm, true) 51 err = s.service.SetCharm(s.charm, true)
52 c.Assert(err, IsNil) 52 c.Assert(err, IsNil)
53 53
54 testch, force, err := s1.Charm() 54 testch, force, err := s1.Charm()
55 c.Assert(err, IsNil) 55 c.Assert(err, IsNil)
56 c.Assert(force, Equals, false) 56 c.Assert(force, Equals, false)
57 c.Assert(testch.URL(), DeepEquals, s.charm.URL()) 57 c.Assert(testch.URL(), DeepEquals, s.charm.URL())
58 58
59 err = s1.Refresh() 59 err = s1.Refresh()
60 c.Assert(err, IsNil) 60 c.Assert(err, IsNil)
61 testch, force, err = s1.Charm() 61 testch, force, err = s1.Charm()
62 c.Assert(err, IsNil) 62 c.Assert(err, IsNil)
63 c.Assert(force, Equals, true) 63 c.Assert(force, Equals, true)
64 c.Assert(testch.URL(), DeepEquals, s.charm.URL()) 64 c.Assert(testch.URL(), DeepEquals, s.charm.URL())
65
66 err = s.service.EnsureDead()
67 c.Assert(err, IsNil)
68 err = s.State.RemoveService(s.service)
69 c.Assert(err, IsNil)
70 err = s.service.Refresh()
71 c.Assert(err, FitsTypeOf, &state.NotFoundError{})
niemeyer 2012/09/26 14:10:10 c.Assert(state.IsNotFound(err), Equals, true)
rog 2012/09/26 14:21:56 Done.
65 } 72 }
66 73
67 func (s *ServiceSuite) TestServiceExposed(c *C) { 74 func (s *ServiceSuite) TestServiceExposed(c *C) {
68 // Check that querying for the exposed flag works correctly. 75 // Check that querying for the exposed flag works correctly.
69 c.Assert(s.service.IsExposed(), Equals, false) 76 c.Assert(s.service.IsExposed(), Equals, false)
70 77
71 // Check that setting and clearing the exposed flag works correctly. 78 // Check that setting and clearing the exposed flag works correctly.
72 err := s.service.SetExposed() 79 err := s.service.SetExposed()
73 c.Assert(err, IsNil) 80 c.Assert(err, IsNil)
74 c.Assert(s.service.IsExposed(), Equals, true) 81 c.Assert(s.service.IsExposed(), Equals, true)
(...skipping 796 matching lines...) Expand 10 before | Expand all | Expand 10 after
871 case <-time.After(500 * time.Millisecond): 878 case <-time.After(500 * time.Millisecond):
872 c.Fatalf("did not get change") 879 c.Fatalf("did not get change")
873 } 880 }
874 881
875 select { 882 select {
876 case got := <-configWatcher.Changes(): 883 case got := <-configWatcher.Changes():
877 c.Fatalf("got unexpected change: %#v", got) 884 c.Fatalf("got unexpected change: %#v", got)
878 case <-time.After(100 * time.Millisecond): 885 case <-time.After(100 * time.Millisecond):
879 } 886 }
880 } 887 }
OLDNEW

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