From a963a4ab222307bfd692c38fe65bdde263c31c28 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 6 Nov 2014 11:40:39 +0100 Subject: postgresql-tasks: rename once more * tasks/initdb: Move to tasks/initdb/basic. * tasks/initdb_old: Move to tasks/initdb/old-syntax. * tasks/upgrade-basic: Moved to tasks/upgrade/basic. * tasks/upgrade-locale-utf8-syntax: Moved to tasks/upgrade/locale/utf8-syntax. --- postgresql-tests/tasks/initdb/basic/runtest.sh | 20 ++++++++++++++++++++ .../tasks/initdb/old-syntax/runtest.sh | 13 +++++++++++++ postgresql-tests/tasks/initdb/runtest.sh | 20 -------------------- postgresql-tests/tasks/initdb_old/runtest.sh | 13 ------------- postgresql-tests/tasks/upgrade-basic/runtest.sh | 12 ------------ .../tasks/upgrade-locale-utf8-syntax/runtest.sh | 22 ---------------------- postgresql-tests/tasks/upgrade/basic/runtest.sh | 12 ++++++++++++ .../tasks/upgrade/locale/utf8-syntax/runtest.sh | 22 ++++++++++++++++++++++ 8 files changed, 67 insertions(+), 67 deletions(-) create mode 100644 postgresql-tests/tasks/initdb/basic/runtest.sh create mode 100644 postgresql-tests/tasks/initdb/old-syntax/runtest.sh delete mode 100644 postgresql-tests/tasks/initdb/runtest.sh delete mode 100644 postgresql-tests/tasks/initdb_old/runtest.sh delete mode 100644 postgresql-tests/tasks/upgrade-basic/runtest.sh delete mode 100644 postgresql-tests/tasks/upgrade-locale-utf8-syntax/runtest.sh create mode 100644 postgresql-tests/tasks/upgrade/basic/runtest.sh create mode 100644 postgresql-tests/tasks/upgrade/locale/utf8-syntax/runtest.sh diff --git a/postgresql-tests/tasks/initdb/basic/runtest.sh b/postgresql-tests/tasks/initdb/basic/runtest.sh new file mode 100644 index 0000000..f8cf3a5 --- /dev/null +++ b/postgresql-tests/tasks/initdb/basic/runtest.sh @@ -0,0 +1,20 @@ +export DTF_TEST_ID="initdb-basic" +export DTF_TEST_DESCRIPTION="\ +Check that the syntax 'postgresql-setup --initdb' works together with following +'service start postgresql'." + +run() +{ + dtf_postgresql_test_init + if rlIsFedora 18 19 20 21 || rlIsRHEL 5 6 7; then + # This syntaxe is not supported on oler systems. + : + else + rlRun "postgresql-setup --initdb" + rlServiceStart postgresql + dtf_postgresql_check_started + fi + + dtf_postgresql_test_finish +} + diff --git a/postgresql-tests/tasks/initdb/old-syntax/runtest.sh b/postgresql-tests/tasks/initdb/old-syntax/runtest.sh new file mode 100644 index 0000000..1cd77f4 --- /dev/null +++ b/postgresql-tests/tasks/initdb/old-syntax/runtest.sh @@ -0,0 +1,13 @@ +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 +} diff --git a/postgresql-tests/tasks/initdb/runtest.sh b/postgresql-tests/tasks/initdb/runtest.sh deleted file mode 100644 index f8cf3a5..0000000 --- a/postgresql-tests/tasks/initdb/runtest.sh +++ /dev/null @@ -1,20 +0,0 @@ -export DTF_TEST_ID="initdb-basic" -export DTF_TEST_DESCRIPTION="\ -Check that the syntax 'postgresql-setup --initdb' works together with following -'service start postgresql'." - -run() -{ - dtf_postgresql_test_init - if rlIsFedora 18 19 20 21 || rlIsRHEL 5 6 7; then - # This syntaxe is not supported on oler systems. - : - else - rlRun "postgresql-setup --initdb" - rlServiceStart postgresql - dtf_postgresql_check_started - fi - - dtf_postgresql_test_finish -} - diff --git a/postgresql-tests/tasks/initdb_old/runtest.sh b/postgresql-tests/tasks/initdb_old/runtest.sh deleted file mode 100644 index 1cd77f4..0000000 --- a/postgresql-tests/tasks/initdb_old/runtest.sh +++ /dev/null @@ -1,13 +0,0 @@ -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 -} diff --git a/postgresql-tests/tasks/upgrade-basic/runtest.sh b/postgresql-tests/tasks/upgrade-basic/runtest.sh deleted file mode 100644 index 7602830..0000000 --- a/postgresql-tests/tasks/upgrade-basic/runtest.sh +++ /dev/null @@ -1,12 +0,0 @@ -export DTF_TEST_ID="upgrade-basic" -export DTF_TEST_DESCRIPTION="Check postgresql-setup [--]upgrade" - -run() -{ - dtf_postgresql_test_init - - dtf_postgresql_upgrade_tour "$(dtf_postgresql_data_mirror)" basic.tar.gz - rlAssert0 "test wrapper should finish successfully" $? - - dtf_postgresql_test_finish -} diff --git a/postgresql-tests/tasks/upgrade-locale-utf8-syntax/runtest.sh b/postgresql-tests/tasks/upgrade-locale-utf8-syntax/runtest.sh deleted file mode 100644 index 7567e0f..0000000 --- a/postgresql-tests/tasks/upgrade-locale-utf8-syntax/runtest.sh +++ /dev/null @@ -1,22 +0,0 @@ -export DTF_TEST_ID="upgrade-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" - -run() -{ - 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_test_finish -} diff --git a/postgresql-tests/tasks/upgrade/basic/runtest.sh b/postgresql-tests/tasks/upgrade/basic/runtest.sh new file mode 100644 index 0000000..7602830 --- /dev/null +++ b/postgresql-tests/tasks/upgrade/basic/runtest.sh @@ -0,0 +1,12 @@ +export DTF_TEST_ID="upgrade-basic" +export DTF_TEST_DESCRIPTION="Check postgresql-setup [--]upgrade" + +run() +{ + dtf_postgresql_test_init + + dtf_postgresql_upgrade_tour "$(dtf_postgresql_data_mirror)" basic.tar.gz + rlAssert0 "test wrapper should finish successfully" $? + + dtf_postgresql_test_finish +} diff --git a/postgresql-tests/tasks/upgrade/locale/utf8-syntax/runtest.sh b/postgresql-tests/tasks/upgrade/locale/utf8-syntax/runtest.sh new file mode 100644 index 0000000..7567e0f --- /dev/null +++ b/postgresql-tests/tasks/upgrade/locale/utf8-syntax/runtest.sh @@ -0,0 +1,22 @@ +export DTF_TEST_ID="upgrade-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" + +run() +{ + 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_test_finish +} -- cgit