Merge pull request #329 from dagger/bats-gh-action

tests: improve bats/gh integration

.github/workflows/ci.yml

@@ -42,6 +42,23 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     timeout-minutes: 30
+    steps:
+      - name: Check out
+        uses: actions/checkout@v2
+
+      - name: Set up Go
+        uses: actions/setup-go@v1
+        with:
+          go-version: 1.16
+
+      - name: Test
+        run: |
+          make test
+
+  integration:
+    name: Integration
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
       - name: Check out
         uses: actions/checkout@v2
@@ -69,10 +86,14 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Test
-        run: |
-          make test
-
       - name: Integration test
         run: |
           make integration
+
+      - name: Publish Test Report
+        uses: mikepenz/action-junit-report@v2
+        if: always()
+        with:
+          report_paths: "tests/*.xml"
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          check_name: "Report"

.gitignore

@@ -12,6 +12,7 @@
 
 # Test binary, build with `go test -c`
 *.test
+tests/report.xml
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out

pkg/buildkitd/buildkitd.go

@@ -116,13 +116,18 @@ func startBuildkit(ctx context.Context) error {
 	)
 	output, err = cmd.CombinedOutput()
 	if err != nil {
-		log.
+		// If the daemon failed to start because it's already running,
-			Ctx(ctx).
+		// chances are another dagger instance started it. We can just ignore
-			Error().
+		// the error.
-			Err(err).
+		if !strings.Contains(string(output), "Error response from daemon: Conflict.") {
-			Bytes("output", output).
+			log.
-			Msg("unable to start buildkitd")
+				Ctx(ctx).
-		return err
+				Error().
+				Err(err).
+				Bytes("output", output).
+				Msg("unable to start buildkitd")
+			return err
+		}
 	}
 	return waitBuildkit(ctx)
 }

tests/helpers.bash

@@ -7,6 +7,9 @@ common_setup() {
     DAGGER="${DAGGER_BINARY:-$TESTDIR/../cmd/dagger/dagger}"
     export DAGGER
 
+    DAGGER_LOG_FORMAT="pretty"
+    export DAGGER_LOG_FORMAT
+
     DAGGER_STORE="$(mktemp -d -t dagger-store-XXXXXX)"
     export DAGGER_STORE
 }

tests/package.json

@@ -1,7 +1,7 @@
 {
   "license": "Apache-2.0",
   "scripts": {
-    "test": "bats ."
+    "test": "bats --report-formatter junit ."
   },
   "devDependencies": {
     "bats": "https://github.com/bats-core/bats-core.git",