From 4df7075a740def1b68f345dd20bca73ff9fd04b0 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Tue, 14 Nov 2017 13:44:12 -0500
Subject: [PATCH] Remove integration-parallel target

Always run in parallel. The old target can be emulated with

TESTFLAGS_PARALLEL=1 make integration

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 .appveyor.yml | 3 ++-
 .travis.yml   | 3 ++-
 Makefile      | 8 --------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index e916b8e65..f96dd423c 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -31,7 +31,8 @@ test_script:
   # - GIT_CHECK_EXCLUDE="./vendor" TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE/.../..}" C:\MinGW\bin\mingw32-make.exe dco
   - bash.exe -lc "export PATH=/c/tools/mingw64/bin:/c/gopath/src/github.com/containerd/containerd/bin:$PATH ; mingw32-make.exe coverage root-coverage"
   - bash.exe -elc "export PATH=/c/tools/mingw64/bin:/c/gopath/src/github.com/containerd/containerd/bin:$PATH ; mingw32-make.exe integration"
-  - bash.exe -elc "export PATH=/c/tools/mingw64/bin:/c/gopath/src/github.com/containerd/containerd/bin:$PATH ; mingw32-make.exe integration-parallel"
+  # Run the integration suite a second time. See discussion in github.com/containerd/containerd/pull/1759
+  - bash.exe -elc "export PATH=/c/tools/mingw64/bin:/c/gopath/src/github.com/containerd/containerd/bin:$PATH; TESTFLAGS_PARALLEL=1 mingw32-make.exe integration"
 
 on_success:
   codecov --flag windows -f coverage.txt
diff --git a/.travis.yml b/.travis.yml
index a33fc828e..31333c4b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,7 +62,8 @@ script:
   - if [ "$GOOS" = "linux" ]; then make coverage ; fi
   - if [ "$GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH make root-coverage ; fi
   - if [ "$GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH make integration ; fi
-  - if [ "$GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH make integration-parallel ; fi
+  # Run the integration suite a second time. See discussion in github.com/containerd/containerd/pull/1759
+  - if [ "$GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH TESTFLAGS_PARALLEL=1 make integration ; fi
 
 after_success:
   - bash <(curl -s https://codecov.io/bash) -F linux
diff --git a/Makefile b/Makefile
index 37fb5285c..02ce1af73 100644
--- a/Makefile
+++ b/Makefile
@@ -124,10 +124,6 @@ root-test: ## run tests, except integration tests
 	@go test ${TESTFLAGS} $(filter-out ${INTEGRATION_PACKAGE},${TEST_REQUIRES_ROOT_PACKAGES}) -test.root
 
 integration: ## run integration tests
-	@echo "$(WHALE) $@"
-	@go test ${TESTFLAGS} -test.root -parallel 1
-
-integration-parallel: ## run integration tests
 	@echo "$(WHALE) $@"
 	@go test ${TESTFLAGS} -test.root -parallel ${TESTFLAGS_PARALLEL}
 
@@ -195,10 +191,6 @@ root-coverage: ## generate coverage profiles for unit tests that require root
 		fi; \
 	done )
 
-coverage-integration: ## generate coverprofiles from the integration tests
-	@echo "$(WHALE) $@"
-	go test ${TESTFLAGS} -test.short -coverprofile="../../../${INTEGRATION_PACKAGE}/coverage.txt" -covermode=atomic ${INTEGRATION_PACKAGE} -test.root
-
 vendor:
 	@echo "$(WHALE) $@"
 	@vndr