[ostree] tests: do not leave running httpd after tests exit
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] tests: do not leave running httpd after tests exit
- Date: Tue, 7 Oct 2014 14:04:58 +0000 (UTC)
commit 7b0e70b72fb1d7307a018a72dbf4a5c9bff9a235
Author: Giuseppe Scrivano <gscrivan redhat com>
Date: Tue Oct 7 12:05:59 2014 +0200
tests: do not leave running httpd after tests exit
Signed-off-by: Giuseppe Scrivano <gscrivan redhat com>
tests/libtest.sh | 4 ++--
tests/test-commit-sign.sh | 2 +-
tests/test-pull-metalink.sh | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/tests/libtest.sh b/tests/libtest.sh
index e9d4450..459040d 100644
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -157,7 +157,7 @@ setup_fake_remote_repo1() {
mkdir ${test_tmpdir}/httpd
cd httpd
ln -s ${test_tmpdir}/ostree-srv ostree
- ostree trivial-httpd --daemonize -p ${test_tmpdir}/httpd-port $args
+ ostree trivial-httpd --autoexit --daemonize -p ${test_tmpdir}/httpd-port $args
port=$(cat ${test_tmpdir}/httpd-port)
echo "http://127.0.0.1:${port}" > ${test_tmpdir}/httpd-address
cd ${oldpwd}
@@ -261,7 +261,7 @@ EOF
mkdir ${test_tmpdir}/httpd
cd httpd
ln -s ${test_tmpdir} ostree
- ostree trivial-httpd --daemonize -p ${test_tmpdir}/httpd-port $args
+ ostree trivial-httpd --autoexit --daemonize -p ${test_tmpdir}/httpd-port $args
port=$(cat ${test_tmpdir}/httpd-port)
echo "http://127.0.0.1:${port}" > ${test_tmpdir}/httpd-address
cd ${oldpwd}
diff --git a/tests/test-commit-sign.sh b/tests/test-commit-sign.sh
index 516d655..5e4baff 100755
--- a/tests/test-commit-sign.sh
+++ b/tests/test-commit-sign.sh
@@ -51,7 +51,7 @@ cd ${test_tmpdir}
mkdir ${test_tmpdir}/httpd
cd httpd
ln -s ${test_tmpdir}/ostree-srv ostree
-ostree trivial-httpd --daemonize -p ${test_tmpdir}/httpd-port
+ostree trivial-httpd --autoexit --daemonize -p ${test_tmpdir}/httpd-port
port=$(cat ${test_tmpdir}/httpd-port)
echo "http://127.0.0.1:${port}" > ${test_tmpdir}/httpd-address
cd ${oldpwd}
diff --git a/tests/test-pull-metalink.sh b/tests/test-pull-metalink.sh
index 3d68578..3cd425b 100755
--- a/tests/test-pull-metalink.sh
+++ b/tests/test-pull-metalink.sh
@@ -27,7 +27,7 @@ setup_fake_remote_repo1 "archive-z2"
cd ${test_tmpdir}
mkdir metalink-data
cd metalink-data
-ostree trivial-httpd --daemonize -p ${test_tmpdir}/metalink-httpd-port
+ostree trivial-httpd --autoexit --daemonize -p ${test_tmpdir}/metalink-httpd-port
metalink_port=$(cat ${test_tmpdir}/metalink-httpd-port)
echo "http://127.0.0.1:${metalink_port}" > ${test_tmpdir}/metalink-httpd-address
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]