OLD | NEW |
1 // Copyright 2013 Canonical Ltd. | 1 // Copyright 2013 Canonical Ltd. |
2 // Licensed under the AGPLv3, see LICENCE file for details. | 2 // Licensed under the AGPLv3, see LICENCE file for details. |
3 | 3 |
4 package state | 4 package state |
5 | 5 |
6 import ( | 6 import ( |
7 "errors" | 7 "errors" |
8 "fmt" | 8 "fmt" |
9 "reflect" | 9 "reflect" |
10 "sort" | 10 "sort" |
(...skipping 29 matching lines...) Expand all Loading... |
40 } | 40 } |
41 | 41 |
42 func (s *storeManagerStateSuite) TearDownSuite(c *gc.C) { | 42 func (s *storeManagerStateSuite) TearDownSuite(c *gc.C) { |
43 s.MgoSuite.TearDownSuite(c) | 43 s.MgoSuite.TearDownSuite(c) |
44 s.LoggingSuite.TearDownSuite(c) | 44 s.LoggingSuite.TearDownSuite(c) |
45 } | 45 } |
46 | 46 |
47 func (s *storeManagerStateSuite) SetUpTest(c *gc.C) { | 47 func (s *storeManagerStateSuite) SetUpTest(c *gc.C) { |
48 s.LoggingSuite.SetUpTest(c) | 48 s.LoggingSuite.SetUpTest(c) |
49 s.MgoSuite.SetUpTest(c) | 49 s.MgoSuite.SetUpTest(c) |
50 » s.State = TestingInitialize(c, nil) | 50 » s.State = TestingInitialize(c, nil, Policy(nil)) |
51 s.State.AddUser("admin", "pass") | 51 s.State.AddUser("admin", "pass") |
52 } | 52 } |
53 | 53 |
54 func (s *storeManagerStateSuite) TearDownTest(c *gc.C) { | 54 func (s *storeManagerStateSuite) TearDownTest(c *gc.C) { |
55 s.State.Close() | 55 s.State.Close() |
56 s.MgoSuite.TearDownTest(c) | 56 s.MgoSuite.TearDownTest(c) |
57 s.LoggingSuite.TearDownTest(c) | 57 s.LoggingSuite.TearDownTest(c) |
58 } | 58 } |
59 | 59 |
60 func (s *storeManagerStateSuite) Reset(c *gc.C) { | 60 func (s *storeManagerStateSuite) Reset(c *gc.C) { |
(...skipping 996 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1057 panic(fmt.Errorf("%v mentioned twice in delta set", id)) | 1057 panic(fmt.Errorf("%v mentioned twice in delta set", id)) |
1058 } | 1058 } |
1059 if d.Removed { | 1059 if d.Removed { |
1060 m[id] = nil | 1060 m[id] = nil |
1061 } else { | 1061 } else { |
1062 m[id] = d.Entity | 1062 m[id] = d.Entity |
1063 } | 1063 } |
1064 } | 1064 } |
1065 return m | 1065 return m |
1066 } | 1066 } |
OLD | NEW |