tests: Rename ctdb_test_functions.bash to integration.bash

Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 79adb50b3ce3873c3baf9e6715c1d1c3f181ce43)

diff --git a/ctdb/tests/complex/01_ctdb_nfs_skip_share_check.sh b/ctdb/tests/complex/01_ctdb_nfs_skip_share_check.sh
index 969b445191b0615e108b1abf186786dad89cb9ef..a7ad938fec4ec4612d79cbd351a60948d48098ce 100755 (executable)
--- a/ctdb/tests/complex/01_ctdb_nfs_skip_share_check.sh
+++ b/ctdb/tests/complex/01_ctdb_nfs_skip_share_check.sh
@@ -54,7 +54,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 set -e
 

diff --git a/ctdb/tests/complex/02_ctdb_samba_skip_share_check.sh b/ctdb/tests/complex/02_ctdb_samba_skip_share_check.sh
index c7eadc6b11bb3387853abd9cdd094678d5623071..9097a78baf14b8b66e1b9619ee05b7b9febfb6a4 100755 (executable)
--- a/ctdb/tests/complex/02_ctdb_samba_skip_share_check.sh
+++ b/ctdb/tests/complex/02_ctdb_samba_skip_share_check.sh
@@ -56,7 +56,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 set -e
 

diff --git a/ctdb/tests/complex/11_ctdb_delip_removes_ip.sh b/ctdb/tests/complex/11_ctdb_delip_removes_ip.sh
index f60b630096347685ab29cc987df29e9251053363..043c345fac75d0f147d064434be9ca1ba455cf4c 100755 (executable)
--- a/ctdb/tests/complex/11_ctdb_delip_removes_ip.sh
+++ b/ctdb/tests/complex/11_ctdb_delip_removes_ip.sh
@@ -38,7 +38,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 set -e
 

diff --git a/ctdb/tests/complex/31_nfs_tickle.sh b/ctdb/tests/complex/31_nfs_tickle.sh
index dcbd4d77b20f89bd6214434340f6fb1997276db7..ce4ae81c9d5de8f30e1ba0a9095dd0a148c8d446 100755 (executable)
--- a/ctdb/tests/complex/31_nfs_tickle.sh
+++ b/ctdb/tests/complex/31_nfs_tickle.sh
@@ -39,7 +39,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 set -e
 

diff --git a/ctdb/tests/complex/32_cifs_tickle.sh b/ctdb/tests/complex/32_cifs_tickle.sh
index 3a7738196074e93eb655d86b409aaf166cd712a8..93634e72bd6dc908d63667709b945d2ffcef1b1e 100755 (executable)
--- a/ctdb/tests/complex/32_cifs_tickle.sh
+++ b/ctdb/tests/complex/32_cifs_tickle.sh
@@ -38,7 +38,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 set -e
 

diff --git a/ctdb/tests/complex/33_gratuitous_arp.sh b/ctdb/tests/complex/33_gratuitous_arp.sh
index 8a3de03bede962a8e30470871ade23aa191c569c..721b0f2a348bb3361350e47ae0a9a3c7174d906d 100755 (executable)
--- a/ctdb/tests/complex/33_gratuitous_arp.sh
+++ b/ctdb/tests/complex/33_gratuitous_arp.sh
@@ -38,7 +38,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 set -e
 

diff --git a/ctdb/tests/complex/41_failover_ping_discrete.sh b/ctdb/tests/complex/41_failover_ping_discrete.sh
index 73bc84e30d00157d04ac0c0a5c42aa17d70b16a4..88b2013f06103d62db3915bf0e9b5371e5cfc6a5 100755 (executable)
--- a/ctdb/tests/complex/41_failover_ping_discrete.sh
+++ b/ctdb/tests/complex/41_failover_ping_discrete.sh
@@ -32,7 +32,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 set -e
 

diff --git a/ctdb/tests/complex/42_failover_ssh_hostname.sh b/ctdb/tests/complex/42_failover_ssh_hostname.sh
index f1a01f799d2d6b41f405ba9b1eb6830d4148fe51..defe15ad114080d52141250adba0873038f48f4f 100755 (executable)
--- a/ctdb/tests/complex/42_failover_ssh_hostname.sh
+++ b/ctdb/tests/complex/42_failover_ssh_hostname.sh
@@ -32,7 +32,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 set -e
 

diff --git a/ctdb/tests/complex/43_failover_nfs_basic.sh b/ctdb/tests/complex/43_failover_nfs_basic.sh
index 883a452190ec15bde3859c396bd91e1435344a11..71a822968f71d9e8e88e277a965078f29897a4f7 100755 (executable)
--- a/ctdb/tests/complex/43_failover_nfs_basic.sh
+++ b/ctdb/tests/complex/43_failover_nfs_basic.sh
@@ -36,7 +36,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 set -e
 

diff --git a/ctdb/tests/complex/44_failover_nfs_oneway.sh b/ctdb/tests/complex/44_failover_nfs_oneway.sh
index 8fa12b99ca2d9bcd1c5b20ec36aaaf08f43c1058..7da8d019ec3862e335bf57c6490da635a15ea2c8 100755 (executable)
--- a/ctdb/tests/complex/44_failover_nfs_oneway.sh
+++ b/ctdb/tests/complex/44_failover_nfs_oneway.sh
@@ -38,7 +38,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 set -e
 

diff --git a/ctdb/tests/scripts/ctdb_test_functions.bash b/ctdb/tests/scripts/integration.bash
similarity index 100%
rename from ctdb/tests/scripts/ctdb_test_functions.bash
rename to ctdb/tests/scripts/integration.bash

diff --git a/ctdb/tests/scripts/test_wrap b/ctdb/tests/scripts/test_wrap
index 6c730ef7686ded4b6fcc2691023e2155d1b6e249..df12e4b731f6a9192270b29a312164ead1bba0bb 100755 (executable)
--- a/ctdb/tests/scripts/test_wrap
+++ b/ctdb/tests/scripts/test_wrap
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Execute the given command.  The intention is that it is a function
-# from ctdb_test_functions.bash.
+# from "${TEST_SCRIPTS_DIR}/integration.bash".
 
 PATH="$(dirname $0):${PATH}"
 
@@ -11,6 +11,6 @@ if [ ! $(which $f >/dev/null 2>&1) ] ; then
     [ -x "$d/$f" ] && PATH="$d:$PATH"
 fi
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 "$@"

diff --git a/ctdb/tests/simple/00_ctdb_init.sh b/ctdb/tests/simple/00_ctdb_init.sh
index 7b05b069c0756dcbeea59b97c1df3f68a712d91b..bd15fd7ed6e1f81b1e28fa1fb71098453c3f864a 100755 (executable)
--- a/ctdb/tests/simple/00_ctdb_init.sh
+++ b/ctdb/tests/simple/00_ctdb_init.sh
@@ -22,7 +22,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/00_ctdb_onnode.sh b/ctdb/tests/simple/00_ctdb_onnode.sh
index 3d8221a58c0d1a482e71c70b8896f87c15caf3ba..b17dfe0e762b36bea9472297cb03486e57747b62 100755 (executable)
--- a/ctdb/tests/simple/00_ctdb_onnode.sh
+++ b/ctdb/tests/simple/00_ctdb_onnode.sh
@@ -18,7 +18,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/01_ctdb_version.sh b/ctdb/tests/simple/01_ctdb_version.sh
index 50401d0ba3fc2f96cee436e6fc872612bc7d1e61..5a36ea49eb57f3bbc06e0de95ea98d7fc1f5b90d 100755 (executable)
--- a/ctdb/tests/simple/01_ctdb_version.sh
+++ b/ctdb/tests/simple/01_ctdb_version.sh
@@ -25,7 +25,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/02_ctdb_listvars.sh b/ctdb/tests/simple/02_ctdb_listvars.sh
index 13beaec6393fefebd5430a4e36954c358fd5f7de..2f709a8cc0dd6f95eab7a2e6231758812316526f 100755 (executable)
--- a/ctdb/tests/simple/02_ctdb_listvars.sh
+++ b/ctdb/tests/simple/02_ctdb_listvars.sh
@@ -25,7 +25,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/03_ctdb_getvar.sh b/ctdb/tests/simple/03_ctdb_getvar.sh
index 748e329bed2ed8057e6658912e5fbe9ce7cf5f77..a58aa3bf11790fbd1758c7a32c48f75b22eb86ca 100755 (executable)
--- a/ctdb/tests/simple/03_ctdb_getvar.sh
+++ b/ctdb/tests/simple/03_ctdb_getvar.sh
@@ -26,7 +26,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/04_ctdb_setvar.sh b/ctdb/tests/simple/04_ctdb_setvar.sh
index e8eda3abc4364c465c6f9842044d9d981f87e014..5012e318cc82366218978810393fab84481431c9 100755 (executable)
--- a/ctdb/tests/simple/04_ctdb_setvar.sh
+++ b/ctdb/tests/simple/04_ctdb_setvar.sh
@@ -30,7 +30,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/05_ctdb_listnodes.sh b/ctdb/tests/simple/05_ctdb_listnodes.sh
index 7bcb4142410f015e59634f02e1ecb05ddc8637c4..a84e4af980f190e257e88e67b7e9022e6a2e723b 100755 (executable)
--- a/ctdb/tests/simple/05_ctdb_listnodes.sh
+++ b/ctdb/tests/simple/05_ctdb_listnodes.sh
@@ -22,7 +22,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/06_ctdb_getpid.sh b/ctdb/tests/simple/06_ctdb_getpid.sh
index 5df8e845937bc20b1e88ad4a169b359c4b499af2..7152ad41710497ba1a0fbc9400fc80fe5f70abf1 100755 (executable)
--- a/ctdb/tests/simple/06_ctdb_getpid.sh
+++ b/ctdb/tests/simple/06_ctdb_getpid.sh
@@ -24,7 +24,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/07_ctdb_process_exists.sh b/ctdb/tests/simple/07_ctdb_process_exists.sh
index 6222ee6d244798a9cd5ede7d3fea51404cb8421d..83205aa07f622407a4d29326933c43a0996d54db 100755 (executable)
--- a/ctdb/tests/simple/07_ctdb_process_exists.sh
+++ b/ctdb/tests/simple/07_ctdb_process_exists.sh
@@ -28,7 +28,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/08_ctdb_isnotrecmaster.sh b/ctdb/tests/simple/08_ctdb_isnotrecmaster.sh
index 4f1e09689d20b035b93eca6de07c759459241ffa..138f59c6e793713a554f97009696ff03f7e69deb 100755 (executable)
--- a/ctdb/tests/simple/08_ctdb_isnotrecmaster.sh
+++ b/ctdb/tests/simple/08_ctdb_isnotrecmaster.sh
@@ -24,7 +24,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/09_ctdb_ping.sh b/ctdb/tests/simple/09_ctdb_ping.sh
index 50612a2512e68437be226f7a34d58f2babc6904f..ab6ba146df6f483e3e75bb28b5bff37386f7cb43 100755 (executable)
--- a/ctdb/tests/simple/09_ctdb_ping.sh
+++ b/ctdb/tests/simple/09_ctdb_ping.sh
@@ -27,7 +27,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/11_ctdb_ip.sh b/ctdb/tests/simple/11_ctdb_ip.sh
index 0d7dc5a342485aef2213389e0a87ebc0baaf7a95..2f39061acd9f2498bfb0d9b1d21c38997f278f43 100755 (executable)
--- a/ctdb/tests/simple/11_ctdb_ip.sh
+++ b/ctdb/tests/simple/11_ctdb_ip.sh
@@ -23,7 +23,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/12_ctdb_getdebug.sh b/ctdb/tests/simple/12_ctdb_getdebug.sh
index 76c3f1b875edd37ece9dc64a1e03d4479243a1f3..4a4926d0c60982877e79cb0f9131fe7de9356a4b 100755 (executable)
--- a/ctdb/tests/simple/12_ctdb_getdebug.sh
+++ b/ctdb/tests/simple/12_ctdb_getdebug.sh
@@ -22,7 +22,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/13_ctdb_setdebug.sh b/ctdb/tests/simple/13_ctdb_setdebug.sh
index b3a202d8bb05af8e892f3ba624666777e6d9932a..d1d1f22a8d5e9c12695179740853f0537fca0b1b 100755 (executable)
--- a/ctdb/tests/simple/13_ctdb_setdebug.sh
+++ b/ctdb/tests/simple/13_ctdb_setdebug.sh
@@ -30,7 +30,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/14_ctdb_statistics.sh b/ctdb/tests/simple/14_ctdb_statistics.sh
index 76c520caf48e990fc2f5f5fb1c815d587e3c341f..6a463ba012d2699ffe0de647f4904922e13548db 100755 (executable)
--- a/ctdb/tests/simple/14_ctdb_statistics.sh
+++ b/ctdb/tests/simple/14_ctdb_statistics.sh
@@ -25,7 +25,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/15_ctdb_statisticsreset.sh b/ctdb/tests/simple/15_ctdb_statisticsreset.sh
index 146807f2949f600b4b276b962a50645331a2460a..eaa60d692052e07f166d60129170498209890971 100755 (executable)
--- a/ctdb/tests/simple/15_ctdb_statisticsreset.sh
+++ b/ctdb/tests/simple/15_ctdb_statisticsreset.sh
@@ -24,7 +24,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/16_ctdb_config_add_ip.sh b/ctdb/tests/simple/16_ctdb_config_add_ip.sh
index 3c23ac1d9d17aa4df343cb53be75b6c471c7cf73..b770bd6a6a457a53d219d95bd353c3dcbf0b133f 100755 (executable)
--- a/ctdb/tests/simple/16_ctdb_config_add_ip.sh
+++ b/ctdb/tests/simple/16_ctdb_config_add_ip.sh
@@ -34,7 +34,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/17_ctdb_config_delete_ip.sh b/ctdb/tests/simple/17_ctdb_config_delete_ip.sh
index 04329469938ea12dc1d248d7aed93ad26483848f..1ad9f334365dc29f1465d6b19ed156e07bc9a3e4 100755 (executable)
--- a/ctdb/tests/simple/17_ctdb_config_delete_ip.sh
+++ b/ctdb/tests/simple/17_ctdb_config_delete_ip.sh
@@ -30,7 +30,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/23_ctdb_moveip.sh b/ctdb/tests/simple/23_ctdb_moveip.sh
index b025dc7d3da0c235141eca1ebb4027401b1c4015..7c09e58503021fd165f1f4f42a0c9f8cab9cb965 100755 (executable)
--- a/ctdb/tests/simple/23_ctdb_moveip.sh
+++ b/ctdb/tests/simple/23_ctdb_moveip.sh
@@ -29,7 +29,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/24_ctdb_getdbmap.sh b/ctdb/tests/simple/24_ctdb_getdbmap.sh
index f8377caac2eb89fa76216f882c4bec8a5d240b86..9bed5903914165aacd70b1b724d409b57db58c2f 100755 (executable)
--- a/ctdb/tests/simple/24_ctdb_getdbmap.sh
+++ b/ctdb/tests/simple/24_ctdb_getdbmap.sh
@@ -23,7 +23,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/25_dumpmemory.sh b/ctdb/tests/simple/25_dumpmemory.sh
index 4a6892cb5d7594ee8ec3dba7d09f0117433b7cb9..4082da1d130263f3cf9e30c154e0920e447f4589 100755 (executable)
--- a/ctdb/tests/simple/25_dumpmemory.sh
+++ b/ctdb/tests/simple/25_dumpmemory.sh
@@ -22,7 +22,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/26_ctdb_config_check_error_on_unreachable_ctdb.sh b/ctdb/tests/simple/26_ctdb_config_check_error_on_unreachable_ctdb.sh
index 78541d6e69d04c75fa0d1996c358e114b0580adc..8b92c0ef504353b847281800f2c05bfc67075fad 100755 (executable)
--- a/ctdb/tests/simple/26_ctdb_config_check_error_on_unreachable_ctdb.sh
+++ b/ctdb/tests/simple/26_ctdb_config_check_error_on_unreachable_ctdb.sh
@@ -32,7 +32,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/31_ctdb_disable.sh b/ctdb/tests/simple/31_ctdb_disable.sh
index 8635816393fb2cd5f422a8d3f17fc288ff92accc..d0214549a48c5847a99455f7d2645d14bffb345c 100755 (executable)
--- a/ctdb/tests/simple/31_ctdb_disable.sh
+++ b/ctdb/tests/simple/31_ctdb_disable.sh
@@ -29,7 +29,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/32_ctdb_enable.sh b/ctdb/tests/simple/32_ctdb_enable.sh
index 7bfdc437d462aea8dbf449c841e3b329b2c8d667..7cc3da31291d262bbb0f6e3cbf4bc534390c6a9e 100755 (executable)
--- a/ctdb/tests/simple/32_ctdb_enable.sh
+++ b/ctdb/tests/simple/32_ctdb_enable.sh
@@ -33,7 +33,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/41_ctdb_stop.sh b/ctdb/tests/simple/41_ctdb_stop.sh
index 9e95eda4210a2ed48265a760e30dd38edff99f5e..8f4d77ba685c1f54a0af7a88a03a7d689064abd4 100755 (executable)
--- a/ctdb/tests/simple/41_ctdb_stop.sh
+++ b/ctdb/tests/simple/41_ctdb_stop.sh
@@ -29,7 +29,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/42_ctdb_continue.sh b/ctdb/tests/simple/42_ctdb_continue.sh
index 82e1534b63e32edeb20a11aaa63481419072d2ca..e02a90d08eb22cd36c951e030549d0c5fe0cfaf3 100755 (executable)
--- a/ctdb/tests/simple/42_ctdb_continue.sh
+++ b/ctdb/tests/simple/42_ctdb_continue.sh
@@ -31,7 +31,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/43_stop_recmaster_yield.sh b/ctdb/tests/simple/43_stop_recmaster_yield.sh
index a47991e8be2acaedabd16488a0c12ffd8a882790..e7a825002e56dc93fd4927df4e231421d68ca8df 100755 (executable)
--- a/ctdb/tests/simple/43_stop_recmaster_yield.sh
+++ b/ctdb/tests/simple/43_stop_recmaster_yield.sh
@@ -22,7 +22,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/51_ctdb_bench.sh b/ctdb/tests/simple/51_ctdb_bench.sh
index e629c01e9364486aad6e29f436f7841657ab31fc..d4f7c542d16d631ed1d7e3cdb4a5dd558386ec12 100755 (executable)
--- a/ctdb/tests/simple/51_ctdb_bench.sh
+++ b/ctdb/tests/simple/51_ctdb_bench.sh
@@ -26,7 +26,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/52_ctdb_fetch.sh b/ctdb/tests/simple/52_ctdb_fetch.sh
index 59364190668e75766d502eebffacbe055053c11f..13b3f1fafde37bc01ae1c522f8cc1e86b3230ae7 100755 (executable)
--- a/ctdb/tests/simple/52_ctdb_fetch.sh
+++ b/ctdb/tests/simple/52_ctdb_fetch.sh
@@ -26,7 +26,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/53_ctdb_transaction.sh b/ctdb/tests/simple/53_ctdb_transaction.sh
index 760f78b510e656cc4cf179c002c721efcb97e9e3..b99b3a9fe42aa1cc7893de6a6b665417266688a1 100755 (executable)
--- a/ctdb/tests/simple/53_ctdb_transaction.sh
+++ b/ctdb/tests/simple/53_ctdb_transaction.sh
@@ -22,7 +22,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/54_ctdb_transaction_recovery.sh b/ctdb/tests/simple/54_ctdb_transaction_recovery.sh
index 13a92cccf4cd31f9a376df4ff9b9dbeaf119b10e..baeea22ab101e270fb7beb246160adef39018736 100755 (executable)
--- a/ctdb/tests/simple/54_ctdb_transaction_recovery.sh
+++ b/ctdb/tests/simple/54_ctdb_transaction_recovery.sh
@@ -41,7 +41,7 @@ recovery_loop_start()
        ctdb_test_exit_hook_add "kill $RECLOOP_PID >/dev/null 2>&1"
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/70_recoverpdbbyseqnum.sh b/ctdb/tests/simple/70_recoverpdbbyseqnum.sh
index 4b46cbbb3c8254eacfb33c3e11d33261517cdd40..612366c310ffa947e0c641bee2816ed257317247 100755 (executable)
--- a/ctdb/tests/simple/70_recoverpdbbyseqnum.sh
+++ b/ctdb/tests/simple/70_recoverpdbbyseqnum.sh
@@ -40,7 +40,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/71_ctdb_wipedb.sh b/ctdb/tests/simple/71_ctdb_wipedb.sh
index 385966190843aaf0ce82ec0fd433792335498618..0cd07ccbca6c5005c3a659d96fe09199580da337 100755 (executable)
--- a/ctdb/tests/simple/71_ctdb_wipedb.sh
+++ b/ctdb/tests/simple/71_ctdb_wipedb.sh
@@ -24,7 +24,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/72_update_record_persistent.sh b/ctdb/tests/simple/72_update_record_persistent.sh
index d232b4006f718b377eefbaf058987027c31afee4..50394925377f0ac82452c068998400e7b011394d 100755 (executable)
--- a/ctdb/tests/simple/72_update_record_persistent.sh
+++ b/ctdb/tests/simple/72_update_record_persistent.sh
@@ -26,7 +26,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/73_tunable_NoIPTakeover.sh b/ctdb/tests/simple/73_tunable_NoIPTakeover.sh
index 2f44ce4456c815f14e911944e80fdfb2fc0a9340..eee3da9db2aa5be692cd2af77ccad9f2bcf40886 100755 (executable)
--- a/ctdb/tests/simple/73_tunable_NoIPTakeover.sh
+++ b/ctdb/tests/simple/73_tunable_NoIPTakeover.sh
@@ -24,7 +24,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"
 

diff --git a/ctdb/tests/simple/75_readonly_records_basic.sh b/ctdb/tests/simple/75_readonly_records_basic.sh
index a2bb916635e74cfff1d0da0669e25bdc394c8358..db5b79275a585a07fd33fbbae8401dc91accdd1f 100755 (executable)
--- a/ctdb/tests/simple/75_readonly_records_basic.sh
+++ b/ctdb/tests/simple/75_readonly_records_basic.sh
@@ -39,7 +39,7 @@ Expected results:
 EOF
 }
 
-. ctdb_test_functions.bash
+. "${TEST_SCRIPTS_DIR}/integration.bash"
 
 ctdb_test_init "$@"