commit 6c3d40436b748fd824fda9c3d90b927b7e4f1045
author Carlos Sanchez <carlos@apache.org> Mon Dec 26 12:37:37 2016 +0100
committer GitHub <noreply@github.com> Mon Dec 26 12:37:37 2016 +0100
tree 7989007cfacc89ad5b4bbb9d000de4331b273c7d
parent 9aff279f252148da0c4bd779b89d97eacee93c77

Fix tests in build agents without unzip installed (#409)

tests/install-plugins.bats

diff --git a/tests/install-plugins.bats b/tests/install-plugins.bats
index 0f10eb4..d795f23 100644
--- a/tests/install-plugins.bats
+++ b/tests/install-plugins.bats
@@ -68,9 +68,9 @@
   # Image contains maven-plugin 2.7.1 and ant-plugin 1.3
   run bash -c "docker run -u $UID -v $work:/var/jenkins_home --rm $SUT_IMAGE-install-plugins true"
   assert_success
-  run bash -c "unzip -p $work/plugins/maven-plugin.jpi META-INF/MANIFEST.MF | tr -d '\r'"
+  run unzip_manifest maven-plugin.jpi $work
   assert_line 'Plugin-Version: 2.7.1'
-  run bash -c "unzip -p $work/plugins/ant.jpi META-INF/MANIFEST.MF | tr -d '\r'"
+  run unzip_manifest ant.jpi $work
   assert_line 'Plugin-Version: 1.3'
 
   # Upgrade to new image with different plugins
@@ -79,11 +79,11 @@
   # Images contains maven-plugin 2.13 and ant-plugin 1.2
   run bash -c "docker run -u $UID -v $work:/var/jenkins_home --rm $SUT_IMAGE-upgrade-plugins true"
   assert_success
-  run bash -c "unzip -p $work/plugins/maven-plugin.jpi META-INF/MANIFEST.MF | tr -d '\r'"
+  run unzip_manifest maven-plugin.jpi $work
   assert_success
   # Should be updated
   assert_line 'Plugin-Version: 2.13'
-  run bash -c "unzip -p $work/plugins/ant.jpi META-INF/MANIFEST.MF | tr -d '\r'"
+  run unzip_manifest ant.jpi $work
   # 1.2 is older than the existing 1.3, so keep 1.3
   assert_line 'Plugin-Version: 1.3'
 }
@@ -100,14 +100,14 @@
   # Image contains maven-plugin 2.7.1 and ant-plugin 1.3
   run bash -c "docker run -u $UID -v $work:/var/jenkins_home --rm $SUT_IMAGE-install-plugins curl --connect-timeout 20 --retry 5 --retry-delay 0 --retry-max-time 60 -s -f -L https://updates.jenkins.io/download/plugins/maven-plugin/2.12.1/maven-plugin.hpi -o /var/jenkins_home/plugins/maven-plugin.jpi"
   assert_success
-  run bash -c "unzip -p $work/plugins/maven-plugin.jpi META-INF/MANIFEST.MF | tr -d '\r'"
+  run unzip_manifest maven-plugin.jpi $work
   assert_line 'Plugin-Version: 2.12.1'
   run docker build -t $SUT_IMAGE-upgrade-plugins $BATS_TEST_DIRNAME/upgrade-plugins
   assert_success
   # Images contains maven-plugin 2.13 and ant-plugin 1.2
   run bash -c "docker run -u $UID -v $work:/var/jenkins_home --rm $SUT_IMAGE-upgrade-plugins true"
   assert_success
-  run bash -c "unzip -p $work/plugins/maven-plugin.jpi META-INF/MANIFEST.MF | tr -d '\r'"
+  run unzip_manifest maven-plugin.jpi $work
   assert_success
   # Shouldn't be updated
   refute_line 'Plugin-Version: 2.13'

tests/test_helpers.bash

diff --git a/tests/test_helpers.bash b/tests/test_helpers.bash
index da6d381..eb67f45 100644
--- a/tests/test_helpers.bash
+++ b/tests/test_helpers.bash
@@ -3,7 +3,6 @@
 # check dependencies
 (
     type docker &>/dev/null || ( echo "docker is not available"; exit 1 )
-    type unzip &>/dev/null || ( echo "unzip is not available"; exit 1 )
     type curl &>/dev/null || ( echo "curl is not available"; exit 1 )
 )>&2
 
@@ -77,3 +76,9 @@
     docker kill "$1" &>/dev/null ||:
     docker rm -fv "$1" &>/dev/null ||:
 }
+
+function unzip_manifest {
+    local plugin=$1
+    local work=$2
+    bash -c "docker run --rm -v $work:/var/jenkins_home --entrypoint unzip $SUT_IMAGE -p /var/jenkins_home/plugins/$plugin META-INF/MANIFEST.MF | tr -d '\r'"
+}