diff options
Diffstat (limited to 'tests/lib')
| -rw-r--r-- | tests/lib/inspector | 12 | ||||
| -rw-r--r-- | tests/lib/installer | 13 |
2 files changed, 14 insertions, 11 deletions
diff --git a/tests/lib/inspector b/tests/lib/inspector index 2fb7c409..963e9519 100644 --- a/tests/lib/inspector +++ b/tests/lib/inspector @@ -13,11 +13,6 @@ function is_inspector { } function start_inspector { - if ! is_inspector_supported $INSPECTOR_TYPE; then - die $LINENO"INSPECTOR_TYPE=$INSPECTOR_TYPE is not supported." - fi - - source $TOP_DIR/lib/inspectors/$INSPECTOR_TYPE start_inspector_$INSPECTOR_TYPE } @@ -28,3 +23,10 @@ function stop_inspector { function cleanup_inspector { cleanup_inspector_$INSPECTOR_TYPE } + + +if ! is_inspector_supported $INSPECTOR_TYPE; then + die $LINENO"INSPECTOR_TYPE=$INSPECTOR_TYPE is not supported." +fi + +source $TOP_DIR/lib/inspectors/$INSPECTOR_TYPE diff --git a/tests/lib/installer b/tests/lib/installer index cdde6eff..807023f3 100644 --- a/tests/lib/installer +++ b/tests/lib/installer @@ -15,12 +15,6 @@ function is_installer { } function setup_installer { - if ! is_installer_supported $INSTALLER_TYPE; then - die $LINENO"INSTALLER_TYPE=$INSTALLER_TYPE is not supported." - fi - - source $TOP_DIR/lib/installers/$INSTALLER_TYPE - if ! is_set INSTALLER_IP; then get_installer_ip fi @@ -32,3 +26,10 @@ function setup_installer { function cleanup_installer { cleanup_installer_$INSTALLER_TYPE } + + +if ! is_installer_supported $INSTALLER_TYPE; then + die $LINENO"INSTALLER_TYPE=$INSTALLER_TYPE is not supported." +fi + +source $TOP_DIR/lib/installers/$INSTALLER_TYPE |