Merge branch 'dev' into fix/env-validation

mesg-foundation · Apr 11, 2019 · 96bfe88 · 96bfe88
2 parents 9f6e6dd + 5552a57
commit 96bfe88
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/service/start.go b/service/start.go
@@ -19,7 +19,7 @@ func (s *Service) Start(c container.Container) (serviceIDs []string, err error)
 	}
 	// If there is one but not all services running stop to restart all
 	if status == PARTIAL {
-		if err := s.StopDependencies(c); err != nil {
+		if err := s.Stop(c); err != nil {
 			return nil, err
 		}
 	}

diff --git a/service/start_test.go b/service/start_test.go
@@ -225,6 +225,7 @@ func TestPartiallyRunningService(t *testing.T) {
 	mc.On("StopService", d2.namespace(s.namespace())).Once().Return(nil)
 	mc.On("CreateNetwork", s.namespace()).Once().Return(networkID, nil)
 	mc.On("SharedNetworkID").Twice().Return(sharedNetworkID, nil)
+	mc.On("DeleteNetwork", s.namespace()).Return(nil)
 
 	for i, d := range ds {
 		mockStartService(s, d, mc, networkID, sharedNetworkID, containerServiceIDs[i], nil)