From 1dba49a151609c2fa1f890b7651f9d9e373fd3e4c77fcbf4b139f262c570e248 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Mon, 11 Mar 2019 12:02:19 +0000
Subject: [PATCH] Accepting request 683820 from
 home:cyphar:containers:docker-test

tests.sh: remove integration/ support

OBS-URL: https://build.opensuse.org/request/show/683820
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=298
---
 docker.changes | 1 -
 tests.sh       | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/docker.changes b/docker.changes
index c2502e8..c7bdbbf 100644
--- a/docker.changes
+++ b/docker.changes
@@ -4,7 +4,6 @@ Sun Mar 10 21:12:09 UTC 2019 - Aleksa Sarai <asarai@suse.com>
 - docker-test: improvements to test packaging (we don't need to ship around the
   entire source tree, and we also need to build the born-again integration/
   tests which contain a suite-per-directory).
-- docker-test: add support for running the new integration/ tests with tests.sh
 
 -------------------------------------------------------------------
 Tue Feb 26 09:39:57 UTC 2019 - Michal Jura <mjura@suse.com>
diff --git a/tests.sh b/tests.sh
index 23f5169..4ae0563 100644
--- a/tests.sh
+++ b/tests.sh
@@ -8,7 +8,6 @@ set -Eeuo pipefail
 
 DOCKER_DIR=/usr/src/docker
 SCRIPTS_DIR="$DOCKER_DIR/hack"
-TESTS_EXE="$DOCKER_DIR/integration-cli/tests.main"
 VERSION="$(cat "$DOCKER_DIR/VERSION")"
 
 # working dirs
@@ -17,7 +16,7 @@ FROZEN_IMAGES_DIR="$TEST_TMPDIR/frozen-images"
 FROZEN_IMAGES_LINK=/docker-frozen-images
 BUNDLES_DIR="$TEST_TMPDIR/run/bundles"
 
-readarray -t TESTS < <(find "$DOCKER_DIR" -type f -executable -name 'tests.main')
+readarray -t TESTS < <(find "$DOCKER_DIR/integration-cli" -type f -executable -name 'tests.main')
 CHECK_TIMEOUT="${CHECK_TIMEOUT:-15m}"
 TEST_TIMEOUT="${TEST_TIMEOUT:-6h}"
 TEST_ARGS=("-check.v" "-check.timeout=${CHECK_TIMEOUT}" "-test.timeout=${TEST_TIMEOUT}")
@@ -87,7 +86,7 @@ require_git() { git version >/dev/null 2>&1 ; }
 
 ################################################################################
 
-[ "${#TESTS[@]}" -eq 0 ] || abort "integration tests executable not found at $TESTS_EXE"
+[ "${#TESTS[@]}" -eq 0 ] || abort "integration tests executable not found in $DOCKER_DIR"
 [ "$EUID" -eq 0 ]        || abort "this script must be run as root"
 [ -n "$VERSION" ]        || abort "could not obtain version"