Simplify start/stop helper func in system tests
The system test should never attempt to start or stop any other server
than those that belong to that system test. Therefore, it is not
necessary to specify the system test name in function calls.
Additionally, this makes it possible to run the test inside a
differently named directory, as its name is automatically detected with
the $SYSTESTDIR variable. This enables running the system tests inside a
temporary directory.
Direct use of stop.pl was replaced with a more systematic approach to
use stop_servers helper function.
(cherry picked from commit c100308b7d)
This commit is contained in:
@@ -274,7 +274,7 @@ status=$((status + ret))
|
||||
|
||||
echo_i "Shutting down secondary"
|
||||
|
||||
(cd ..; $SHELL stop.sh rrsetorder ns2 )
|
||||
stop_server ns2
|
||||
|
||||
echo_i "Checking for secondary's on disk copy of zone"
|
||||
|
||||
@@ -286,7 +286,7 @@ fi
|
||||
|
||||
echo_i "Re-starting secondary"
|
||||
|
||||
start_server --noclean --restart --port ${PORT} rrsetorder ns2
|
||||
start_server --noclean --restart --port ${PORT} ns2
|
||||
|
||||
#
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user