diff options
Diffstat (limited to 'postgresql-tests/tasks/initdb')
| -rw-r--r-- | postgresql-tests/tasks/initdb/config.sh | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | postgresql-tests/tasks/initdb/runtest.sh | 29 |
2 files changed, 19 insertions, 14 deletions
diff --git a/postgresql-tests/tasks/initdb/config.sh b/postgresql-tests/tasks/initdb/config.sh deleted file mode 100644 index c7f6619..0000000 --- a/postgresql-tests/tasks/initdb/config.sh +++ /dev/null @@ -1,4 +0,0 @@ -DTF_TEST_ID="initdb-basic" -DTF_TEST_DESCRIPTION="\ -Check that the syntax 'postgresql-setup --initdb' works together with following -'service start postgresql'." diff --git a/postgresql-tests/tasks/initdb/runtest.sh b/postgresql-tests/tasks/initdb/runtest.sh index ee520d6..f8cf3a5 100755..100644 --- a/postgresql-tests/tasks/initdb/runtest.sh +++ b/postgresql-tests/tasks/initdb/runtest.sh @@ -1,11 +1,20 @@ -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 +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 +} -dtf_postgresql_test_finish |