From 2b837c69aa48cda461a9b9c6fcc5b327228203374d35dbe81ebe8671949eee51 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Thu, 19 Oct 2017 02:18:11 +0000
Subject: [PATCH] Accepting request 535073 from
 home:cyphar:containers:docker-ce_v17.07

Re-enable tests and correct changelog (again).

OBS-URL: https://build.opensuse.org/request/show/535073
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=206
---
 docker.changes                                   |  1 +
 docker.spec                                      |  7 ++++++-
 integration-cli-fix-TestInfoEnsureSucceeds.patch | 13 -------------
 3 files changed, 7 insertions(+), 14 deletions(-)
 delete mode 100644 integration-cli-fix-TestInfoEnsureSucceeds.patch

diff --git a/docker.changes b/docker.changes
index 2f35e91..f75ff90 100644
--- a/docker.changes
+++ b/docker.changes
@@ -15,6 +15,7 @@ Mon Oct  9 11:36:59 UTC 2017 - asarai@suse.com
 - Removed no-longer needed patches.
   - bsc1037436-0001-client-check-tty-before-creating-exec-job.patch
   - bsc1037607-0001-apparmor-make-pkg-aaparser-work-on-read-only-root.patch
+  - integration-cli-fix-TestInfoEnsureSucceeds.patch
 - Added backport of https://github.com/moby/moby/pull/34573. bsc#1045628
   + bsc1045628-0001-devicemapper-remove-container-rootfs-mountPath-after.patch
 - Rewrite secrets patches to correctly handle directories in a way that doesn't
diff --git a/docker.spec b/docker.spec
index c9c7ed7..f39e230 100644
--- a/docker.spec
+++ b/docker.spec
@@ -260,6 +260,7 @@ PKG_LIST=$(go list -e \
 		-tags "$DOCKER_BUILDTAGS" \
 		-a "${BUILDFLAGS[@]}" ... \
 		| grep    'github.com/docker/docker' \
+		| grep -Ev 'vendor/(.+/)?github.com/docker/docker' \
 		| grep -v 'github.com/docker/docker/vendor' \
 		| grep -v 'github.com/docker/docker/integration-cli' \
 		| grep -v 'github.com/docker/docker/pkg/archive$' \
@@ -279,6 +280,10 @@ PKG_LIST=$(go list -e \
 		| grep -v 'github.com/docker/docker/daemon/graphdriver' \
 		| grep -v 'github.com/docker/docker/cmd/dockerd$' \
 		| grep -v 'github.com/docker/docker/pkg/integration$' \
+		| grep -v 'github.com/docker/docker/pkg/testutil' \
+%if 0%{?sle_version} == 120000
+		| grep -v 'github.com/docker/docker/pkg/devicemapper$' \
+%endif
 %if ! 0%{?with_libseccomp}
 		| grep -v 'github.com/docker/docker/profiles/seccomp$' \
 %endif
@@ -286,7 +291,7 @@ PKG_LIST=$(go list -e \
 
 rm ./pkg/system/rm_test.go
 
-#go test -buildmode=pie -cover -ldflags -w -tags "$DOCKER_BUILDTAGS" -a -test.timeout=10m $PKG_LIST
+go test -buildmode=pie -cover -ldflags -w -tags "$DOCKER_BUILDTAGS" -a -test.timeout=10m $PKG_LIST
 
 # DOCKER CLIENT
 cp -ar %{buildroot}/usr/src/docker/cli $HOME/go/src/github.com/docker/cli
diff --git a/integration-cli-fix-TestInfoEnsureSucceeds.patch b/integration-cli-fix-TestInfoEnsureSucceeds.patch
deleted file mode 100644
index 261dcde..0000000
--- a/integration-cli-fix-TestInfoEnsureSucceeds.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/integration-cli/docker_cli_info_test.go b/integration-cli/docker_cli_info_test.go
-index 5eb2f0f..39f93bd 100644
---- a/integration-cli/docker_cli_info_test.go
-+++ b/integration-cli/docker_cli_info_test.go
-@@ -41,7 +41,7 @@ func (s *DockerSuite) TestInfoEnsureSucceeds(c *check.C) {
- 	}
- 
- 	if DaemonIsLinux() {
--		stringsToCheck = append(stringsToCheck, "Runtimes:", "Default Runtime: runc")
-+		stringsToCheck = append(stringsToCheck, "Runtimes:", "Default Runtime: oci")
- 	}
- 
- 	if testEnv.ExperimentalDaemon() {