ctdb-tests: Fix location of persistent databases

Always use CTDB_DBDIR_PERSISTENT, which is setup by the test
infrastructure.  The persistent database directory is
not (necessarily) relative to the volatile one.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/tests/eventscripts/00.ctdb.init.007.sh b/ctdb/tests/eventscripts/00.ctdb.init.007.sh
index a0741ce2f33293a66de9263edf302da4a4f5285b..5121513e248eb79ad1cee641be846cb6d6513ad1 100755 (executable)
--- a/ctdb/tests/eventscripts/00.ctdb.init.007.sh
+++ b/ctdb/tests/eventscripts/00.ctdb.init.007.sh
@@ -8,7 +8,7 @@ setup
 
 FAKE_TDBTOOL_SUPPORTS_CHECK="yes"
 
-touch "${CTDB_DBDIR}/persistent/foo.tdb.0"
+touch "${CTDB_DBDIR_PERSISTENT}/foo.tdb.0"
 FAKE_TDB_IS_OK="yes"
 
 ok_null

diff --git a/ctdb/tests/eventscripts/00.ctdb.init.008.sh b/ctdb/tests/eventscripts/00.ctdb.init.008.sh
index 310c101f02cd043db479070478141172e5614d86..120aefc380505f361e1142d44b4cbd29c8519857 100755 (executable)
--- a/ctdb/tests/eventscripts/00.ctdb.init.008.sh
+++ b/ctdb/tests/eventscripts/00.ctdb.init.008.sh
@@ -8,7 +8,7 @@ setup
 
 FAKE_TDBTOOL_SUPPORTS_CHECK="yes"
 
-db="${CTDB_DBDIR}/persistent/foo.tdb.0"
+db="${CTDB_DBDIR_PERSISTENT}/foo.tdb.0"
 touch "$db"
 FAKE_TDB_IS_OK="no"