diff --git a/test/expect/help-help-001.log b/test/expect/real-help-001.log similarity index 100% rename from test/expect/help-help-001.log rename to test/expect/real-help-001.log diff --git a/test/lib/pgBackRestTest/Common/DefineTest.pm b/test/lib/pgBackRestTest/Common/DefineTest.pm index 36a542946..23bce4f2c 100644 --- a/test/lib/pgBackRestTest/Common/DefineTest.pm +++ b/test/lib/pgBackRestTest/Common/DefineTest.pm @@ -400,20 +400,6 @@ my $oTestDef = }, ] }, - # Help tests - { - &TESTDEF_NAME => 'help', - &TESTDEF_CONTAINER => true, - &TESTDEF_EXPECT => true, - - &TESTDEF_TEST => - [ - { - &TESTDEF_NAME => 'help', - &TESTDEF_TOTAL => 1, - } - ] - }, # Config tests { &TESTDEF_NAME => 'config', @@ -837,12 +823,18 @@ my $oTestDef = { &TESTDEF_NAME => 'real', &TESTDEF_EXPECT => true, - &TESTDEF_INDIVIDUAL => true, &TESTDEF_TEST => [ + { + &TESTDEF_NAME => 'help', + &TESTDEF_CONTAINER => true, + &TESTDEF_TOTAL => 1, + }, + { &TESTDEF_NAME => 'all', + &TESTDEF_INDIVIDUAL => true, &TESTDEF_TOTAL => 6, &TESTDEF_DB => true, } diff --git a/test/lib/pgBackRestTest/Module/Help/HelpHelpTest.pm b/test/lib/pgBackRestTest/Module/Real/RealHelpTest.pm similarity index 95% rename from test/lib/pgBackRestTest/Module/Help/HelpHelpTest.pm rename to test/lib/pgBackRestTest/Module/Real/RealHelpTest.pm index 41d5c01ac..d26ee5b0a 100644 --- a/test/lib/pgBackRestTest/Module/Help/HelpHelpTest.pm +++ b/test/lib/pgBackRestTest/Module/Real/RealHelpTest.pm @@ -1,7 +1,7 @@ #################################################################################################################################### -# HelpHelpTest.pm - Tests for help command +# Tests for help command #################################################################################################################################### -package pgBackRestTest::Module::Help::HelpHelpTest; +package pgBackRestTest::Module::Real::RealHelpTest; use parent 'pgBackRestTest::Common::RunTest'; #################################################################################################################################### diff --git a/test/test.pl b/test/test.pl index a3c92de9b..2ea440c89 100755 --- a/test/test.pl +++ b/test/test.pl @@ -340,6 +340,7 @@ eval if ($oStorageTest->exists($strVBoxService)) { + executeTest("sudo killall VBoxService"); executeTest("sudo ${strVBoxService} --timesync-set-start"); }