Merge branch 'junit_passed' of https://github.com/manosnoam/ginkgo in…

…to junit_passed
onsi · Jun 30, 2019 · 5860cdd · 5860cdd
2 parents 230f436 + 29c6c8e
commit 5860cdd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/integration/_fixtures/combined_coverage_fixture/first_package/coverage.txt b/integration/_fixtures/combined_coverage_fixture/first_package/coverage.txt
@@ -0,0 +1,6 @@
+mode: atomic
+github.com/onsi/ginkgo/integration/_fixtures/combined_coverage_fixture/first_package/coverage.go:3.17,5.2 1 1
+github.com/onsi/ginkgo/integration/_fixtures/combined_coverage_fixture/first_package/coverage.go:7.17,9.2 1 1
+github.com/onsi/ginkgo/integration/_fixtures/combined_coverage_fixture/first_package/coverage.go:11.17,13.2 1 1
+github.com/onsi/ginkgo/integration/_fixtures/combined_coverage_fixture/first_package/coverage.go:15.17,17.2 1 1
+github.com/onsi/ginkgo/integration/_fixtures/combined_coverage_fixture/first_package/coverage.go:19.17,21.2 1 0
diff --git a/integration/_fixtures/combined_coverage_fixture/second_package/coverage.txt b/integration/_fixtures/combined_coverage_fixture/second_package/coverage.txt
@@ -0,0 +1,6 @@
+mode: atomic
+github.com/onsi/ginkgo/integration/_fixtures/combined_coverage_fixture/second_package/coverage.go:3.17,5.2 1 1
+github.com/onsi/ginkgo/integration/_fixtures/combined_coverage_fixture/second_package/coverage.go:7.17,9.2 1 1
+github.com/onsi/ginkgo/integration/_fixtures/combined_coverage_fixture/second_package/coverage.go:11.17,13.2 1 1
+github.com/onsi/ginkgo/integration/_fixtures/combined_coverage_fixture/second_package/coverage.go:15.17,17.2 1 1
+github.com/onsi/ginkgo/integration/_fixtures/combined_coverage_fixture/second_package/coverage.go:19.17,21.2 1 1
diff --git a/internal/specrunner/spec_runner_test.go b/internal/specrunner/spec_runner_test.go
@@ -720,6 +720,7 @@ var _ = Describe("Spec Runner", func() {
 				"R1.WillRun",
 				"R2.WillRun",
 				"A",
+				"BYTES",
 				"R2.DidComplete",
 				"R1.DidComplete",
 				"TRUNCATE",
@@ -734,6 +735,7 @@ var _ = Describe("Spec Runner", func() {
 				"R1.WillRun",
 				"R2.WillRun",
 				"C",
+				"BYTES",
 				"R2.DidComplete",
 				"R1.DidComplete",
 			}))