From a963a4ab222307bfd692c38fe65bdde263c31c28 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
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 ++++++++++++++++++++
 postgresql-tests/tasks/initdb/old-syntax/runtest.sh | 13 +++++++++++++
 postgresql-tests/tasks/initdb/runtest.sh            | 20 --------------------
 3 files changed, 33 insertions(+), 20 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

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

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
-}
-
-- 
cgit