diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2014-10-24 14:29:35 +0200 |
|---|---|---|
| committer | Pavel Raiskup <praiskup@redhat.com> | 2014-10-24 14:29:35 +0200 |
| commit | 2a6faa0853239377f191cdd72efc60f1df684ebd (patch) | |
| tree | 2c8180a86ee2a289c6d8a6ff37b764624352af2f /postgresql-tests/tasks/upgrade-utf8-syntax | |
| parent | f9ec27bd843e40f89ace7705a075e938aa3a9409 (diff) | |
| download | postgresql-setup-tests-2a6faa0853239377f191cdd72efc60f1df684ebd.tar.gz postgresql-setup-tests-2a6faa0853239377f191cdd72efc60f1df684ebd.tar.xz postgresql-setup-tests-2a6faa0853239377f191cdd72efc60f1df684ebd.zip | |
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.
Diffstat (limited to 'postgresql-tests/tasks/upgrade-utf8-syntax')
| -rw-r--r-- | postgresql-tests/tasks/upgrade-utf8-syntax/config.sh | 3 | ||||
| -rw-r--r-- | postgresql-tests/tasks/upgrade-utf8-syntax/runtest.sh | 29 |
2 files changed, 18 insertions, 14 deletions
diff --git a/postgresql-tests/tasks/upgrade-utf8-syntax/config.sh b/postgresql-tests/tasks/upgrade-utf8-syntax/config.sh deleted file mode 100644 index bed95ad..0000000 --- a/postgresql-tests/tasks/upgrade-utf8-syntax/config.sh +++ /dev/null @@ -1,3 +0,0 @@ -export DTF_TEST_ID="basic-locale-utf8-syntax" -export DTF_TEST_DESCRIPTION="Check postgresql-setup --upgrade works even when \ -the system locale changed from xx_XX.utf8 to xx_XX.UTF-8" diff --git a/postgresql-tests/tasks/upgrade-utf8-syntax/runtest.sh b/postgresql-tests/tasks/upgrade-utf8-syntax/runtest.sh index cc8f8c4..c14a34e 100644 --- a/postgresql-tests/tasks/upgrade-utf8-syntax/runtest.sh +++ b/postgresql-tests/tasks/upgrade-utf8-syntax/runtest.sh @@ -1,15 +1,22 @@ -dtf_postgresql_test_init +export DTF_TEST_ID="basic-locale-utf8-syntax" +export DTF_TEST_DESCRIPTION="Check postgresql-setup --upgrade works even when \ +the system locale changed from xx_XX.utf8 to xx_XX.UTF-8" -dtf_postgresql_cb_upgrade_select() +run() { - if rlIsFedora 20 21 22; then - cat - else - cat >/dev/null - fi -} + dtf_postgresql_test_init + + dtf_postgresql_cb_upgrade_select() + { + if rlIsFedora 20 21 22; then + cat + else + cat >/dev/null + fi + } -dtf_postgresql_upgrade_tour "$(dtf_postgresql_data_mirror)" locale-utf-typo.tar.gz -rlAssert0 "test wrapper should finish successfully" $? + dtf_postgresql_upgrade_tour "$(dtf_postgresql_data_mirror)" locale-utf-typo.tar.gz + rlAssert0 "test wrapper should finish successfully" $? -dtf_postgresql_test_finish + dtf_postgresql_test_finish +} |