summaryrefslogtreecommitdiff
diff options
authorPawel Stolowski <stolowski@gmail.com>2018-08-16 16:54:29 +0200
committerPawel Stolowski <stolowski@gmail.com>2018-08-16 16:54:29 +0200
commitc0785664728dd5c3ae33f29e7bfdc54b26ff5b2b (patch)
tree8818a7f52382ac1c6bddc8ad0ca527d58c9113f2
parent23c5acfd807b4537e62b2b6aa40080f326372023 (diff)
Two more review comments.disconnect-hooks
-rw-r--r--overlord/ifacestate/ifacestate_test.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/overlord/ifacestate/ifacestate_test.go b/overlord/ifacestate/ifacestate_test.go
index 3635dc65a1..7ec57f7a65 100644
--- a/overlord/ifacestate/ifacestate_test.go
+++ b/overlord/ifacestate/ifacestate_test.go
@@ -599,7 +599,7 @@ func (s *interfaceManagerSuite) TestAutoconnectConflictOnConnectWithAutoFlag(c *
c.Assert(err, ErrorMatches, `task should be retried`)
}
-func (s *interfaceManagerSuite) TestAutoconnectNoConflictOnConnect(c *C) {
+func (s *interfaceManagerSuite) TestAutoconnectRetryOnConnect(c *C) {
s.state.Lock()
task := s.state.NewTask("connect", "")
task.Set("slot", interfaces.SlotRef{Snap: "producer", Name: "slot"})
@@ -3258,7 +3258,8 @@ func (s *interfaceManagerSuite) TestDisconnectInterfaces(c *C) {
s.state.Unlock()
- s.settle(c)
+ s.se.Ensure()
+ s.se.Wait()
s.state.Lock()
defer s.state.Unlock()