ctdb-tests: Remove export of CTDB_SOCKET
authorMartin Schwenke <martin@meltin.net>
Thu, 10 May 2018 06:48:31 +0000 (16:48 +1000)
committerAmitay Isaacs <amitay@samba.org>
Tue, 6 Nov 2018 06:16:14 +0000 (07:16 +0100)
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/tests/takeover_helper/scripts/local.sh
ctdb/tests/tool/scripts/local.sh

index f12e1be1977d0972a73e9c1880d470bdbb596ace..7aa8734595a542f2c25b0a3b57d354bf80e2ddaf 100644 (file)
@@ -55,7 +55,6 @@ setup_ctdbd ()
        $VALGRIND fake_ctdbd -d "$FAKE_CTDBD_DEBUGLEVEL" \
                  -s "$ctdbd_socket" -p "$ctdbd_pidfile" \
                  -D "$ctdbd_dbdir"
-       export CTDB_SOCKET="$ctdbd_socket"
        # This current translates to a 6 second timeout for the
        # important controls
        ctdb setvar TakeoverTimeout 2
index 83e47b44b80e22f94467bc306d4abf19c910d98e..9b2750e62e2cf4640d931e37b535246f59bd418d 100644 (file)
@@ -26,7 +26,6 @@ define_test ()
        ctdb.*)
            _cmd="${_f#ctdb.}"
            _cmd="${_cmd%.*}" # Strip test number
-           export CTDB_SOCKET="$ctdbd_socket"
            export CTDB="ctdb"
            export CTDB_DEBUGLEVEL=NOTICE
            if [ -z "$FAKE_CTDBD_DEBUGLEVEL" ] ; then