From 69c86e4a0fcb3f086d62a7fe6913f09df7cdc742 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Thu, 6 Nov 2014 10:58:23 +0100
Subject: postgresql-tasks: rename tests

* postgresql-tests/tasks/upgrade-basic/runtest.sh: Sync the test
name with directory name.
* postgresql-tests/tasks/upgrade-utf8-syntax/runtest.sh: Rename to
postgresql-tests/tasks/upgrade-locale-utf8-syntax/runtest.sh.
---
 postgresql-tests/tasks/upgrade-basic/runtest.sh    |  2 +-
 .../tasks/upgrade-locale-utf8-syntax/runtest.sh    | 22 ++++++++++++++++++++++
 .../tasks/upgrade-utf8-syntax/runtest.sh           | 22 ----------------------
 3 files changed, 23 insertions(+), 23 deletions(-)
 create mode 100644 postgresql-tests/tasks/upgrade-locale-utf8-syntax/runtest.sh
 delete mode 100644 postgresql-tests/tasks/upgrade-utf8-syntax/runtest.sh

(limited to 'postgresql-tests/tasks')

diff --git a/postgresql-tests/tasks/upgrade-basic/runtest.sh b/postgresql-tests/tasks/upgrade-basic/runtest.sh
index 7952fe0..7602830 100644
--- a/postgresql-tests/tasks/upgrade-basic/runtest.sh
+++ b/postgresql-tests/tasks/upgrade-basic/runtest.sh
@@ -1,4 +1,4 @@
-export DTF_TEST_ID="basic-upgrade"
+export DTF_TEST_ID="upgrade-basic"
 export DTF_TEST_DESCRIPTION="Check postgresql-setup [--]upgrade"
 
 run()
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
+}
diff --git a/postgresql-tests/tasks/upgrade-utf8-syntax/runtest.sh b/postgresql-tests/tasks/upgrade-utf8-syntax/runtest.sh
deleted file mode 100644
index c14a34e..0000000
--- a/postgresql-tests/tasks/upgrade-utf8-syntax/runtest.sh
+++ /dev/null
@@ -1,22 +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"
-
-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