Merge pull request #871 from mesg-foundation/feature/cleanup-service-…

…tests service: cleanup tests
mesg-foundation · Apr 12, 2019 · bdfd937 · bdfd937
2 parents c60658d + 471335f
commit bdfd937
Show file tree

Hide file tree

Showing 8 changed files with 303 additions and 240 deletions.
diff --git a/service/dependency_test.go b/service/dependency_test.go
@@ -35,13 +35,15 @@ func testDependencyLogs(t *testing.T, do func(s *Service, c container.Container,
 	go wstd.Write(stdData)
 	go werr.Write(errData)
 
-	s := &Service{
-		Hash: "1",
-		Dependencies: []*Dependency{
-			{Key: dependencyKey},
-		},
-	}
-	mc := &mocks.Container{}
+	var (
+		s = &Service{
+			Hash: "1",
+			Dependencies: []*Dependency{
+				{Key: dependencyKey},
+			},
+		}
+		mc = &mocks.Container{}
+	)
 
 	d, _ := s.getDependency(dependencyKey)
 	mc.On("ServiceLogs", d.namespace(s.namespace())).Once().Return(rp, nil)

diff --git a/service/event_test.go b/service/event_test.go
@@ -15,6 +15,7 @@ func TestGetEvent(t *testing.T) {
 			},
 		}
 	)
+
 	e, err := s.GetEvent(eventKey)
 	require.NoError(t, err)
 	require.Equal(t, eventKey, e.Key)
@@ -31,6 +32,7 @@ func TestGetEventNonExistent(t *testing.T) {
 			},
 		}
 	)
+
 	e, err := s.GetEvent(eventKey)
 	require.Zero(t, e)
 	require.Equal(t, &EventNotFoundError{

diff --git a/service/logs_integration_test.go b/service/logs_integration_test.go
@@ -9,21 +9,24 @@ import (
 )
 
 func TestIntegrationLogs(t *testing.T) {
-	service := &Service{
-		Hash: "1",
-		Name: "TestLogs",
-		Dependencies: []*Dependency{
-			{
-				Key:   "test",
-				Image: "http-server",
+	var (
+		service = &Service{
+			Hash: "1",
+			Name: "TestLogs",
+			Dependencies: []*Dependency{
+				{
+					Key:   "test",
+					Image: "http-server",
+				},
+				{
+					Key:   "test2",
+					Image: "http-server",
+				},
 			},
-			{
-				Key:   "test2",
-				Image: "http-server",
-			},
-		},
-	}
-	c := newIntegrationContainer(t)
+		}
+		c = newIntegrationContainer(t)
+	)
+
 	service.Start(c)
 	defer service.Stop(c)
 	readers, err := service.Logs(c)
@@ -32,21 +35,24 @@ func TestIntegrationLogs(t *testing.T) {
 }
 
 func TestIntegrationLogsOnlyOneDependency(t *testing.T) {
-	service := &Service{
-		Hash: "1",
-		Name: "TestLogsOnlyOneDependency",
-		Dependencies: []*Dependency{
-			{
-				Key:   "test",
-				Image: "http-server",
+	var (
+		service = &Service{
+			Hash: "1",
+			Name: "TestLogsOnlyOneDependency",
+			Dependencies: []*Dependency{
+				{
+					Key:   "test",
+					Image: "http-server",
+				},
+				{
+					Key:   "test2",
+					Image: "http-server",
+				},
 			},
-			{
-				Key:   "test2",
-				Image: "http-server",
-			},
-		},
-	}
-	c := newIntegrationContainer(t)
+		}
+		c = newIntegrationContainer(t)
+	)
+
 	service.Start(c)
 	defer service.Stop(c)
 	readers, err := service.Logs(c, "test2")

diff --git a/service/service_test.go b/service/service_test.go
@@ -14,9 +14,9 @@ func TestNew(t *testing.T) {
 	var (
 		path = "../service-test/task"
 		hash = "1"
+		mc   = &mocks.Container{}
 	)
 
-	mc := &mocks.Container{}
 	mc.On("Build", mock.Anything).Once().Return(hash, nil)
 
 	statuses := make(chan DeployStatus, 4)
@@ -45,9 +45,9 @@ func TestNewWithDefaultEnv(t *testing.T) {
 		path = "../service-test/env"
 		hash = "1"
 		env  = []string{"A=1", "B=2"}
+		mc   = &mocks.Container{}
 	)
 
-	mc := &mocks.Container{}
 	mc.On("Build", mock.Anything).Once().Return(hash, nil)
 
 	s, err := New(path, mc, nil, nil)
@@ -64,9 +64,9 @@ func TestNewWithOverwrittenEnv(t *testing.T) {
 		path = "../service-test/env"
 		hash = "1"
 		env  = []string{"A=3", "B=4"}
+		mc   = &mocks.Container{}
 	)
 
-	mc := &mocks.Container{}
 	mc.On("Build", mock.Anything).Once().Return(hash, nil)
 
 	s, err := New(path, mc, nil, xos.EnvSliceToMap(env))
@@ -81,10 +81,9 @@ func TestNewWithOverwrittenEnv(t *testing.T) {
 func TestNewWitNotDefinedEnv(t *testing.T) {
 	var (
 		path = "../service-test/task"
+		mc   = &mocks.Container{}
 	)
 
-	mc := &mocks.Container{}
-
 	_, err := New(path, mc, nil, xos.EnvSliceToMap([]string{"A=1", "B=2"}))
 	require.Equal(t, ErrNotDefinedEnv{[]string{"A", "B"}}, err)
 
@@ -97,8 +96,11 @@ func TestErrNotDefinedEnv(t *testing.T) {
 }
 
 func TestInjectDefinitionWithConfig(t *testing.T) {
-	command := "xxx"
-	s := &Service{}
+	var (
+		command = "xxx"
+		s       = &Service{}
+	)
+
 	s.injectDefinition(&importer.ServiceDefinition{
 		Configuration: &importer.Dependency{
 			Command: command,
@@ -112,6 +114,7 @@ func TestInjectDefinitionWithDependency(t *testing.T) {
 		s     = &Service{}
 		image = "xxx"
 	)
+
 	s.injectDefinition(&importer.ServiceDefinition{
 		Dependencies: map[string]*importer.Dependency{
 			"test": {