From 2a6faa0853239377f191cdd72efc60f1df684ebd Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Fri, 24 Oct 2014 14:29:35 +0200
Subject: tester/run: better define API

Define test return values and its calling.  Do not split the
testcase into configuration and running script, rather use one
file and wrap the script by run() method.  This is still very easy
to run without running whole testsuite.

* tester/run (DTF_RESULT_*): Return values API.
(run): Rename to run_test.  Make the function more readable, don't
generate xml results (not yet used anyway).
* postgresql-tests/config.sh: Do not source the per-testsuite
library directly as the configuration script config.h is sourced
even by 'run' script itself for --dist option (for that action we
actually do not need per-testsuite libraries).
* postgresql-tests/tasks/initdb/runtest.sh: New API used.
* postgresql-tests/tasks/initdb_old/runtest.sh: Likewise.
* postgresql-tests/tasks/upgrade-basic/runtest.sh: Likewise.
* postgresql-tests/tasks/upgrade-utf8-syntax/runtest.sh: Likewise.
* postgresql-tests/tasks/upgrade-basic/config.sh: Remove.
* postgresql-tests/tasks/initdb/config.sh: Remove.
* postgresql-tests/tasks/initdb_old/config.sh: Remove.
* postgresql-tests/tasks/upgrade-utf8-syntax/config.sh: Remove.
---
 postgresql-tests/tasks/initdb_old/config.sh  |  4 ----
 postgresql-tests/tasks/initdb_old/runtest.sh | 18 +++++++++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)
 delete mode 100644 postgresql-tests/tasks/initdb_old/config.sh
 mode change 100755 => 100644 postgresql-tests/tasks/initdb_old/runtest.sh

(limited to 'postgresql-tests/tasks/initdb_old')

diff --git a/postgresql-tests/tasks/initdb_old/config.sh b/postgresql-tests/tasks/initdb_old/config.sh
deleted file mode 100644
index 2386677..0000000
--- a/postgresql-tests/tasks/initdb_old/config.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-DTF_TEST_ID="initdb-old-syntax"
-DTF_TEST_DESCRIPTION="\
-Check that the old syntax 'postgresql-setup initdb' works together with
-following 'service start postgresql'."
diff --git a/postgresql-tests/tasks/initdb_old/runtest.sh b/postgresql-tests/tasks/initdb_old/runtest.sh
old mode 100755
new mode 100644
index 6a8d63c..1cd77f4
--- a/postgresql-tests/tasks/initdb_old/runtest.sh
+++ b/postgresql-tests/tasks/initdb_old/runtest.sh
@@ -1,5 +1,13 @@
-dtf_postgresql_test_init
-rlRun "postgresql-setup initdb"
-rlServiceStart postgresql
-dtf_postgresql_check_started
-dtf_postgresql_test_finish
+export DTF_TEST_ID="initdb-old-syntax"
+export DTF_TEST_DESCRIPTION="\
+Check that the old syntax 'postgresql-setup initdb' works together with
+following 'service start postgresql'."
+
+run()
+{
+    dtf_postgresql_test_init
+    rlRun "postgresql-setup initdb"
+    rlServiceStart postgresql
+    dtf_postgresql_check_started
+    dtf_postgresql_test_finish
+}
-- 
cgit