rpm/docker
SHA256
1
0
Fork 0
forked from pool/docker
Code Pull Requests Activity

Accepting request 425388 from home:thipp:branch:Virtualization:containers

Browse Source 
- fix integration test case

OBS-URL: https://build.opensuse.org/request/show/425388
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=140
This commit is contained in:
Alvaro Saurin 2016-09-09 12:03:05 +00:00 committed by Git OBS Bridge
parent f0b7966b11
commit 266b75a4a6
3 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Sep 7 16:33:59 UTC 2016 - thipp@suse.de
- fix integration test case
-------------------------------------------------------------------
Tue Sep 6 13:28:38 UTC 2016 - thipp@suse.de

2
docker.spec
View File

@ -65,6 +65,7 @@ Patch100: gcc-go-patches.patch
Patch101: netlink_gcc_go.patch
Patch102: netlink_netns_powerpc.patch
Patch200: docker-mount-secrets.patch
Patch300: integration-cli-fix-TestInfoEnsureSucceeds.patch
BuildRequires: audit
BuildRequires: bash-completion
BuildRequires: device-mapper-devel >= 1.2.68
@ -178,6 +179,7 @@ Test package for docker. It contains the source code and the tests.
%patch101 -p1
%patch102 -p1
%endif
%patch300 -p1
cp %{SOURCE7} .
cp %{SOURCE10} .

26
integration-cli-fix-TestInfoEnsureSucceeds.patch Normal file
View File

@ -0,0 +1,26 @@
From 0f0c0fcb5b956782385e25c7c6c625e6c79ac78f Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thipp@suse.de>
Date: Wed, 7 Sep 2016 10:54:09 +0200
Subject: [PATCH] integration-cli: fix TestInfoEnsureSucceeds
Signed-off-by: Thomas Hipp <thipp@suse.de>
---
integration-cli/docker_cli_info_test.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/integration-cli/docker_cli_info_test.go b/integration-cli/docker_cli_info_test.go
index a48e69a..c265a36 100644
--- a/integration-cli/docker_cli_info_test.go
+++ b/integration-cli/docker_cli_info_test.go
@@ -36,7 +36,7 @@ func (s *DockerSuite) TestInfoEnsureSucceeds(c *check.C) {
}
if DaemonIsLinux.Condition() {
- stringsToCheck = append(stringsToCheck, "Runtimes:", "Default Runtime: runc")
+ stringsToCheck = append(stringsToCheck, "Runtimes:", "Default Runtime: oci")
}
if utils.ExperimentalBuild() {
--
2.9.3