Add integration test CI task and fix integration test

.circleci/config.yml

@@ -1,54 +1,31 @@
 version: 2
 
-onlyTagProd: &onlyTagProd
-  filters:
-    tags:
-      only: /^v.*/
-    branches:
-      ignore: /.*/
-onlyBranchDev: &onlyBranchDev
-  filters:
-    branches:
-      only:
-        - dev
-transient: &transient
-  filters:
-    tags:
-      only: /.*/
 runOnMachine: &runOnMachine
   machine:
     docker_layer_caching: true
   working_directory: ~/.go_workspace/src/github.com/mesg-foundation/core
+
 runOnDocker: &runOnDocker
   docker:
     - image: circleci/golang:1.10
   working_directory: /go/src/github.com/mesg-foundation/core
 
 jobs:
-  "build_docker":
-    <<: *runOnMachine
-    steps:
-      - checkout
-      - run: docker pull mesg/core:latest
-      - run: docker build -t mesg/core:$CIRCLE_SHA1 --build-arg version="dev build `echo $CIRCLE_SHA1 | cut -c1-7`" .
-
   "test":
     <<: *runOnDocker
     steps:
       - checkout
       - setup_remote_docker
-      - run: go get -t ./...
       - run: docker swarm init
       - run: docker build -t sleep docker-images/sleep/
       - run: docker build -t http-server docker-images/http-server/
-      - run: env MESG_CORE_IMAGE=mesg/core:$CIRCLE_SHA1 go test -timeout 180s -p 1 -coverprofile=coverage.txt ./...
+      - run: go test -timeout 180s -p 1 -tags=integration -coverprofile=coverage.txt ./...
       - run: bash <(curl -s https://codecov.io/bash)
 
   "publish_docker_dev":
     <<: *runOnMachine
     steps:
       - checkout
-      - run: docker pull mesg/core:dev
       - run: docker build -t mesg/core:dev --build-arg version="dev build `echo $CIRCLE_SHA1 | cut -c1-7`" .
       - run: docker login -u $DOCKER_USER -p $DOCKER_PASS
       - run: docker push mesg/core:dev
@@ -57,7 +34,6 @@ jobs:
     <<: *runOnMachine
     steps:
       - checkout
-      - run: docker pull mesg/core:latest
       - run: docker build -t mesg/core:$CIRCLE_TAG -t mesg/core:latest --build-arg version=$CIRCLE_TAG .
       - run: docker login -u $DOCKER_USER -p $DOCKER_PASS
       - run: docker push mesg/core:$CIRCLE_TAG
@@ -69,7 +45,7 @@ jobs:
       - checkout
       - run: scripts/build-cli.sh "dev build `echo $CIRCLE_SHA1 | cut -c1-7`"
       - run: go get -u github.com/tcnksm/ghr
-      - run: ghr -u mesg-foundation -r core -delete -prerelease -b "Warning - this is a developer release, use it only if you know what are doing. Make sure to pull the latest \`mesg/core:dev\` image. \`\`\`docker pull mesg/core:dev\`\`\`" release-dev ./bin
+      - run: ghr -u mesg-foundation -r core -delete -prerelease -n "Developer Release" -b "Warning - this is a developer release, use it only if you know what are doing. Make sure to pull the latest \`mesg/core:dev\` image. \`\`\`docker pull mesg/core:dev\`\`\`" release-dev ./bin
 
   "release_cli_prod":
     <<: *runOnDocker
@@ -81,27 +57,44 @@ jobs:
 
 workflows:
   version: 2
-  build_n_deploy:
+
+  pull_request:
     jobs:
-      - "build_docker":
-          <<: *transient
       - "test":
-          <<: *transient
-          requires:
-            - "build_docker"
+          filters:
+            tags:
+              ignore: /.*/
+            branches:
+              ignore:
+                - "dev"
+                - "master"
+
+  release_dev:
+    jobs:
+      - "test":
+          filters:
+            tags:
+              ignore: /.*/
+            branches:
+              only: dev
       - "publish_docker_dev":
-          <<: *onlyBranchDev
           requires:
             - "test"
       - "release_cli_dev":
-          <<: *onlyBranchDev
           requires:
             - "publish_docker_dev"
+
+  release_prod:
+    jobs:
+      - "test":
+          filters:
+            tags:
+              only: /^v.*/
+            branches:
+              only: master
       - "publish_docker_prod":
-          <<: *onlyTagProd
           requires:
             - "test"
       - "release_cli_prod":
-          <<: *onlyTagProd
           requires:
             - "publish_docker_prod"

container/network.go

@@ -8,6 +8,15 @@ import (
 	docker "github.com/docker/docker/client"
 )
 
+// NetworkEventType is a type to define the kind of event related to the network
+type NetworkEventType string
+
+// List of Network status to listen to confirm a network deletion
+const (
+	NetworkRemove  NetworkEventType = "remove"
+	NetworkDestroy NetworkEventType = "destroy"
+)
+
 // CreateNetwork creates a Docker Network with a namespace.
 func (c *Container) CreateNetwork(namespace []string) (id string, err error) {
 	network, err := c.FindNetwork(namespace)
@@ -34,7 +43,10 @@ func (c *Container) CreateNetwork(namespace []string) (id string, err error) {
 }
 
 // DeleteNetwork deletes a Docker Network associated with a namespace.
-func (c *Container) DeleteNetwork(namespace []string) error {
+// event parameter can be "destroy" or "remove". If the network was used by a service, the event to use is "destroy". If the network has not been used, the event is "remove".
+// Remove removes the reference from Docker to the network.
+// Destroy removes the network from Docker active network.
+func (c *Container) DeleteNetwork(namespace []string, event NetworkEventType) error {
 	network, err := c.FindNetwork(namespace)
 	if docker.IsErrNotFound(err) {
 		return nil
@@ -50,7 +62,7 @@ func (c *Container) DeleteNetwork(namespace []string) error {
 			Value: network.ID,
 		}, filters.KeyValuePair{
 			Key:   "event",
-			Value: "destroy",
+			Value: string(event),
 		}),
 	})
 	err = c.client.NetworkRemove(ctx, network.ID)

container/network_integration_test.go

@@ -12,7 +12,7 @@ func TestIntegrationCreateNetwork(t *testing.T) {
 	c, err := New()
 	require.Nil(t, err)
 	networkID, err := c.CreateNetwork([]string{"TestCreateNetwork"})
-	defer c.DeleteNetwork([]string{"TestCreateNetwork"})
+	defer c.DeleteNetwork([]string{"TestCreateNetwork"}, NetworkRemove)
 	require.Nil(t, err)
 	require.NotEqual(t, "", networkID)
 }
@@ -22,7 +22,7 @@ func TestIntegrationCreateAlreadyExistingNetwork(t *testing.T) {
 	require.Nil(t, err)
 	c.CreateNetwork([]string{"TestCreateAlreadyExistingNetwork"})
 	networkID, err := c.CreateNetwork([]string{"TestCreateAlreadyExistingNetwork"})
-	defer c.DeleteNetwork([]string{"TestCreateAlreadyExistingNetwork"})
+	defer c.DeleteNetwork([]string{"TestCreateAlreadyExistingNetwork"}, NetworkRemove)
 	require.Nil(t, err)
 	require.NotEqual(t, "", networkID)
 }
@@ -31,22 +31,22 @@ func TestIntegrationDeleteNetwork(t *testing.T) {
 	c, err := New()
 	require.Nil(t, err)
 	c.CreateNetwork([]string{"TestDeleteNetwork"})
-	err = c.DeleteNetwork([]string{"TestDeleteNetwork"})
+	err = c.DeleteNetwork([]string{"TestDeleteNetwork"}, NetworkRemove)
 	require.Nil(t, err)
 }
 
 func TestIntegrationDeleteNotExistingNetwork(t *testing.T) {
 	c, err := New()
 	require.Nil(t, err)
-	err = c.DeleteNetwork([]string{"TestDeleteNotExistingNetwork"})
+	err = c.DeleteNetwork([]string{"TestDeleteNotExistingNetwork"}, NetworkRemove)
 	require.Nil(t, err)
 }
 
 func TestIntegrationFindNetwork(t *testing.T) {
 	c, err := New()
 	require.Nil(t, err)
 	c.CreateNetwork([]string{"TestFindNetwork"})
-	defer c.DeleteNetwork([]string{"TestFindNetwork"})
+	defer c.DeleteNetwork([]string{"TestFindNetwork"}, NetworkRemove)
 	network, err := c.FindNetwork([]string{"TestFindNetwork"})
 	require.Nil(t, err)
 	require.NotEqual(t, "", network.ID)
@@ -63,7 +63,7 @@ func TestIntegrationFindDeletedNetwork(t *testing.T) {
 	c, err := New()
 	require.Nil(t, err)
 	c.CreateNetwork([]string{"TestFindDeletedNetwork"})
-	c.DeleteNetwork([]string{"TestFindDeletedNetwork"})
+	c.DeleteNetwork([]string{"TestFindDeletedNetwork"}, NetworkRemove)
 	_, err = c.FindNetwork([]string{"TestFindDeletedNetwork"})
 	require.NotNil(t, err)
 }

container/network_test.go

@@ -85,7 +85,7 @@ func TestDeleteNetwork(t *testing.T) {
 
 	dt.ProvideNetworkInspect(types.NetworkResource{ID: id}, nil)
 
-	require.Nil(t, c.DeleteNetwork(namespace))
+	require.Nil(t, c.DeleteNetwork(namespace, NetworkRemove))
 
 	li := <-dt.LastNetworkInspect()
 	require.Equal(t, c.Namespace(namespace), li.Network)
@@ -106,7 +106,7 @@ func TestDeleteNotExistingNetwork(t *testing.T) {
 
 	dt.ProvideNetworkInspect(types.NetworkResource{}, dockertest.NotFoundErr{})
 
-	require.Nil(t, c.DeleteNetwork(namespace))
+	require.Nil(t, c.DeleteNetwork(namespace, NetworkRemove))
 
 	select {
 	case <-dt.LastNetworkRemove():
@@ -129,7 +129,7 @@ func TestDeleteNetworkError(t *testing.T) {
 
 	dt.ProvideNetworkInspect(types.NetworkResource{}, errNetworkDelete)
 
-	require.NotNil(t, c.DeleteNetwork(namespace))
+	require.NotNil(t, c.DeleteNetwork(namespace, NetworkRemove))
 }
 
 func TestFindNetwork(t *testing.T) {

container/service_integration_test.go

@@ -54,38 +54,38 @@ func TestIntegrationStopNotExistingService(t *testing.T) {
 	require.Nil(t, err)
 	namespace := []string{"TestStopNotExistingService"}
 	err = c.StopService(namespace)
-	require.Nil(t, err)
+	require.NotNil(t, err)
 }
 
-func TestIntegrationServiceStatusNeverStarted(t *testing.T) {
+func TestIntegrationStatusNeverStarted(t *testing.T) {
 	c, err := New()
 	require.Nil(t, err)
-	namespace := []string{"TestServiceStatusNeverStarted"}
-	status, err := c.ServiceStatus(namespace)
+	namespace := []string{"TestStatusNeverStarted"}
+	status, err := c.Status(namespace)
 	require.Nil(t, err)
 	require.NotEqual(t, RUNNING, status)
 	require.Equal(t, STOPPED, status)
 }
 
-func TestIntegrationServiceStatusRunning(t *testing.T) {
+func TestIntegrationStatusRunning(t *testing.T) {
 	c, err := New()
 	require.Nil(t, err)
-	namespace := []string{"TestServiceStatusRunning"}
+	namespace := []string{"TestStatusRunning"}
 	startTestService(namespace)
 	defer c.StopService(namespace)
-	status, err := c.ServiceStatus(namespace)
+	status, err := c.Status(namespace)
 	require.Nil(t, err)
 	require.Equal(t, status, RUNNING)
 	require.NotEqual(t, status, STOPPED)
 }
 
-func TestIntegrationServiceStatusStopped(t *testing.T) {
+func TestIntegrationStatusStopped(t *testing.T) {
 	c, err := New()
 	require.Nil(t, err)
-	namespace := []string{"TestServiceStatusStopped"}
+	namespace := []string{"TestStatusStopped"}
 	startTestService(namespace)
 	c.StopService(namespace)
-	status, err := c.ServiceStatus(namespace)
+	status, err := c.Status(namespace)
 	require.Nil(t, err)
 	require.Equal(t, status, STOPPED)
 	require.NotEqual(t, status, RUNNING)
@@ -155,7 +155,7 @@ func TestIntegrationListServices(t *testing.T) {
 	services, err := c.ListServices("label_name")
 	require.Nil(t, err)
 	require.Equal(t, 1, len(services))
-	require.Equal(t, Namespace([]string{"TestListServices"}), services[0].Spec.Name)
+	require.Equal(t, c.Namespace([]string{"TestListServices"}), services[0].Spec.Name)
 }
 
 func TestIntegrationServiceLogs(t *testing.T) {

container/shared_network_integration_test.go

@@ -17,7 +17,7 @@ func removeSharedNetworkIfExist(c *Container) error {
 		}
 		return err
 	}
-	return c.client.NetworkRemove(context.Background(), Namespace(sharedNetworkNamespace))
+	return c.client.NetworkRemove(context.Background(), c.Namespace([]string{}))
 }
 
 func TestIntegrationCreateSharedNetworkIfNeeded(t *testing.T) {

interface/grpc/core/deploy_integration_test.go

@@ -3,10 +3,8 @@
 package core
 
 import (
-	"fmt"
 	"testing"
 
-	"github.com/logrusorgru/aurora"
 	"github.com/mesg-foundation/core/api"
 	"github.com/stretchr/testify/require"
 )
@@ -23,7 +21,7 @@ func TestIntegrationDeployService(t *testing.T) {
 
 	require.Len(t, stream.serviceID, 40)
 	require.Contains(t, stream.statuses, api.DeployStatus{
-		Message: fmt.Sprintf("%s Completed.", aurora.Green("✔")),
-		Type:    api.DONE,
+		Message: "Image built with success.",
+		Type:    api.DonePositive,
 	})
 }

service/start_integration_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestStartService(t *testing.T) {
+func TestStartServiceIntegration(t *testing.T) {
 	service, _ := FromService(&Service{
 		Name: "TestStartService",
 		Dependencies: []*Dependency{
@@ -27,7 +27,7 @@ func TestStartService(t *testing.T) {
 	require.Equal(t, RUNNING, status)
 }
 
-func TestStartWith2Dependencies(t *testing.T) {
+func TestStartWith2DependenciesIntegration(t *testing.T) {
 	c := newContainer(t)
 	service, _ := FromService(&Service{
 		Name: "TestStartWith2Dependencies",
@@ -113,7 +113,7 @@ func TestStartDependency(t *testing.T) {
 		},
 	}, ContainerOption(c))
 	networkID, err := c.CreateNetwork(service.namespace())
-	defer c.DeleteNetwork(service.namespace())
+	defer c.DeleteNetwork(service.namespace(), container.NetworkDestroy)
 	dep := service.Dependencies[0]
 	serviceID, err := dep.Start(networkID)
 	defer dep.Stop()