From 1b10b795bd2e46bac5f0748f3fc7c1683fdbe024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20MOHIER?= Date: Tue, 3 Jan 2017 15:43:16 +0100 Subject: [PATCH] Fix virtualenv test --- test/test_virtualenv_setup.sh | 3 ++- test/virtualenv_install_files/install_root | 9 +-------- test/virtualenv_install_files/install_root_travis | 9 +-------- test/virtualenv_install_files/install_virtualenv | 9 +-------- test/virtualenv_install_files/install_virtualenv_travis | 9 +-------- 5 files changed, 6 insertions(+), 33 deletions(-) diff --git a/test/test_virtualenv_setup.sh b/test/test_virtualenv_setup.sh index eae9523f5..7041f9159 100755 --- a/test/test_virtualenv_setup.sh +++ b/test/test_virtualenv_setup.sh @@ -126,6 +126,7 @@ for raw_file in $(awk '{print $2}' $1); do if [[ "$exp_chmod" == "" ]]; then echo "Can't find file in conf after sed - RAWFILE:$raw_file, FILE:$file" fi + echo "Found the file: $file" cur_chmod=$(stat -c "%a" $file 2>> /tmp/stat.failure) if [[ $? -ne 0 ]];then @@ -197,7 +198,7 @@ for pyenv in "root" "virtualenv"; do echo "Installing alignak..." $SUDO python setup.py $install_type 2>&1 >/dev/null - echo "Running test..." + echo "Running test (${install_type}_${pyenv}${SUFFIX_TESTFILE})..." test_setup "test/virtualenv_install_files/${install_type}_${pyenv}${SUFFIX_TESTFILE}" if [[ $? -ne 0 ]];then diff --git a/test/virtualenv_install_files/install_root b/test/virtualenv_install_files/install_root index 2d7124510..2d77a7b96 100644 --- a/test/virtualenv_install_files/install_root +++ b/test/virtualenv_install_files/install_root @@ -6,6 +6,7 @@ 755 /usr/local/bin/alignak-scheduler 755 /usr/local/etc/alignak 644 /usr/local/etc/alignak/alignak.cfg +644 /usr/local/etc/alignak/alignak.ini 755 /usr/local/etc/alignak/certs 644 /usr/local/etc/alignak/certs/README 755 /usr/local/etc/alignak/daemons @@ -98,14 +99,6 @@ 644 /usr/local/etc/alignak/arbiter/resource.d/paths.cfg 755 /usr/local/etc/alignak/arbiter/modules 644 /usr/local/etc/alignak/arbiter/modules/readme.cfg -644 /usr/local/etc/default/alignak -755 /usr/local/etc/init.d/alignak -755 /usr/local/etc/init.d/alignak-arbiter -755 /usr/local/etc/init.d/alignak-broker -755 /usr/local/etc/init.d/alignak-poller -755 /usr/local/etc/init.d/alignak-reactionner -755 /usr/local/etc/init.d/alignak-receiver -755 /usr/local/etc/init.d/alignak-scheduler 755 /usr/local/lib/PYTHONVERSION/dist-packages/alignak 755 /usr/local/lib/PYTHONVERSION/dist-packages/alignak-ALIGNAKVERSION.egg-info 644 /usr/local/lib/PYTHONVERSION/dist-packages/alignak/__init__.py diff --git a/test/virtualenv_install_files/install_root_travis b/test/virtualenv_install_files/install_root_travis index 9fa690cab..a87289386 100644 --- a/test/virtualenv_install_files/install_root_travis +++ b/test/virtualenv_install_files/install_root_travis @@ -6,6 +6,7 @@ 755 /usr/local/bin/alignak-scheduler 755 /usr/local/etc/alignak 644 /usr/local/etc/alignak/alignak.cfg +644 /usr/local/etc/alignak/alignak.ini 755 /usr/local/etc/alignak/certs 644 /usr/local/etc/alignak/certs/README 755 /usr/local/etc/alignak/daemons @@ -98,14 +99,6 @@ 644 /usr/local/etc/alignak/sample/sample/hosts/srv-oracle.cfg 644 /usr/local/etc/alignak/sample/sample/hosts/srv-mongodb.cfg 644 /usr/local/etc/alignak/sample/sample/hosts/br-erp.cfg -644 /usr/local/etc/default/alignak -755 /usr/local/etc/init.d/alignak -755 /usr/local/etc/init.d/alignak-arbiter -755 /usr/local/etc/init.d/alignak-broker -755 /usr/local/etc/init.d/alignak-poller -755 /usr/local/etc/init.d/alignak-reactionner -755 /usr/local/etc/init.d/alignak-receiver -755 /usr/local/etc/init.d/alignak-scheduler 755 /usr/local/lib/PYTHONVERSION/dist-packages/alignak 755 /usr/local/lib/PYTHONVERSION/dist-packages/alignak-ALIGNAKVERSION-SHORTPYVERSION.egg-info 644 /usr/local/lib/PYTHONVERSION/dist-packages/alignak/__init__.py diff --git a/test/virtualenv_install_files/install_virtualenv b/test/virtualenv_install_files/install_virtualenv index aed9486cf..e94dd3eb0 100644 --- a/test/virtualenv_install_files/install_virtualenv +++ b/test/virtualenv_install_files/install_virtualenv @@ -6,6 +6,7 @@ 755 VIRTUALENVPATH/bin/alignak-scheduler 755 VIRTUALPATH/etc/alignak 644 VIRTUALPATH/etc/alignak/alignak.cfg +644 VIRTUALPATH/etc/alignak/alignak.ini 755 VIRTUALPATH/etc/alignak/certs 644 VIRTUALPATH/etc/alignak/certs/README 755 VIRTUALPATH/etc/alignak/daemons @@ -98,14 +99,6 @@ 644 VIRTUALPATH/etc/alignak/sample/sample/hosts/srv-oracle.cfg 644 VIRTUALPATH/etc/alignak/sample/sample/hosts/srv-mongodb.cfg 644 VIRTUALPATH/etc/alignak/sample/sample/hosts/br-erp.cfg -644 VIRTUALPATH/etc/default/alignak -755 VIRTUALPATH/etc/init.d/alignak -755 VIRTUALPATH/etc/init.d/alignak-arbiter -755 VIRTUALPATH/etc/init.d/alignak-broker -755 VIRTUALPATH/etc/init.d/alignak-poller -755 VIRTUALPATH/etc/init.d/alignak-reactionner -755 VIRTUALPATH/etc/init.d/alignak-receiver -755 VIRTUALPATH/etc/init.d/alignak-scheduler 755 VIRTUALENVPATH/lib/PYTHONVERSION/site-packages/alignak 755 VIRTUALENVPATH/lib/PYTHONVERSION/site-packages/alignak-ALIGNAKVERSION-SHORTPYVERSION.egg-info 644 VIRTUALENVPATH/lib/PYTHONVERSION/site-packages/alignak/__init__.py diff --git a/test/virtualenv_install_files/install_virtualenv_travis b/test/virtualenv_install_files/install_virtualenv_travis index 63f89163b..7e9a91599 100644 --- a/test/virtualenv_install_files/install_virtualenv_travis +++ b/test/virtualenv_install_files/install_virtualenv_travis @@ -6,6 +6,7 @@ 755 VIRTUALENVPATH/bin/alignak-scheduler 755 VIRTUALENVPATH/etc/alignak 644 VIRTUALENVPATH/etc/alignak/alignak.cfg +644 VIRTUALENVPATH/etc/alignak/alignak.ini 755 VIRTUALENVPATH/etc/alignak/certs 644 VIRTUALENVPATH/etc/alignak/certs/README 755 VIRTUALENVPATH/etc/alignak/daemons @@ -98,14 +99,6 @@ 644 VIRTUALENVPATH/etc/alignak/sample/sample/hosts/srv-oracle.cfg 644 VIRTUALENVPATH/etc/alignak/sample/sample/hosts/srv-mongodb.cfg 644 VIRTUALENVPATH/etc/alignak/sample/sample/hosts/br-erp.cfg -644 VIRTUALENVPATH/etc/default/alignak -755 VIRTUALENVPATH/etc/init.d/alignak -755 VIRTUALENVPATH/etc/init.d/alignak-arbiter -755 VIRTUALENVPATH/etc/init.d/alignak-broker -755 VIRTUALENVPATH/etc/init.d/alignak-poller -755 VIRTUALENVPATH/etc/init.d/alignak-reactionner -755 VIRTUALENVPATH/etc/init.d/alignak-receiver -755 VIRTUALENVPATH/etc/init.d/alignak-scheduler 755 VIRTUALENVPATH/lib/PYTHONVERSION/site-packages/alignak 755 VIRTUALENVPATH/lib/PYTHONVERSION/site-packages/alignak-ALIGNAKVERSION-SHORTPYVERSION.egg-info 644 VIRTUALENVPATH/lib/PYTHONVERSION/site-packages/alignak/__init__.py