diff --git a/libs/test/CMakeLists.txt b/libs/test/CMakeLists.txt index 9d38fdefb..d1c1d1fed 100644 --- a/libs/test/CMakeLists.txt +++ b/libs/test/CMakeLists.txt @@ -81,6 +81,7 @@ if (ENABLE_ALL_TESTS) LIBS libharness $<$:OpenSSL::SSL> + test_support TEST_DEPENDS s_client ) @@ -98,6 +99,7 @@ if (ENABLE_ALL_TESTS) LIBS libharness $<$:OpenSSL::SSL> + test_support TEST_DEPENDS s_test ) diff --git a/libs/test/TestAbortCmd.cpp b/libs/test/TestAbortCmd.cpp index ca4f07f0c..0089b7afc 100644 --- a/libs/test/TestAbortCmd.cpp +++ b/libs/test/TestAbortCmd.cpp @@ -16,6 +16,7 @@ #include "ServerTestHarness.hpp" #include "TestFixture.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/core/DurationTimer.hpp" #include "ecflow/node/Defs.hpp" @@ -35,8 +36,9 @@ BOOST_AUTO_TEST_SUITE(T_AbortCmd) // is defined. Then providing its value is less the the task's try number // we should do an immediate job submission. BOOST_AUTO_TEST_CASE(test_abort_cmd) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_abort_cmd " << flush; TestClean clean_at_start_and_end; // Create the defs file corresponding to the text below diff --git a/libs/test/TestAlias.cpp b/libs/test/TestAlias.cpp index de5d0171f..2f21db123 100644 --- a/libs/test/TestAlias.cpp +++ b/libs/test/TestAlias.cpp @@ -16,6 +16,7 @@ #include "ServerTestHarness.hpp" #include "TestFixture.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/base/cts/user/CFileCmd.hpp" #include "ecflow/core/AssertTimer.hpp" @@ -63,8 +64,9 @@ void wait_for_alias_to_complete(const std::string& alias_path) { } BOOST_AUTO_TEST_CASE(test_alias) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_alias " << flush; TestClean clean_at_start_and_end; // Create the defs file corresponding to the text below diff --git a/libs/test/TestClkSync.cpp b/libs/test/TestClkSync.cpp index 221e20e3d..cf1f59c99 100644 --- a/libs/test/TestClkSync.cpp +++ b/libs/test/TestClkSync.cpp @@ -17,6 +17,7 @@ #include "ServerTestHarness.hpp" #include "TestFixture.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/core/DurationTimer.hpp" #include "ecflow/core/PrintStyle.hpp" @@ -35,6 +36,8 @@ BOOST_AUTO_TEST_SUITE(S_Test) BOOST_AUTO_TEST_SUITE(T_ClkSync) BOOST_AUTO_TEST_CASE(test_clk_sync) { + ECF_NAME_THIS_TEST(); + // This test is used to test sync'ing of the suite calendars // The default clock type is *real*. We will create a suite with a hybrid clock attribute // For the suite calendar, we do not persist the clock type(hybrid/real), since this can be @@ -47,7 +50,6 @@ BOOST_AUTO_TEST_CASE(test_clk_sync) { // This is done in ServerTestHarness via invariant checking. DurationTimer timer; - cout << "Test:: ...test_clk_sync " << flush; TestClean clean_at_start_and_end; // Create the defs file corresponding to the text below @@ -80,8 +82,9 @@ BOOST_AUTO_TEST_CASE(test_clk_sync) { } BOOST_AUTO_TEST_CASE(test_suite_calendar_sync) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_suite_calendar_sync " << flush; TestClean clean_at_start_and_end; // When using ECF_SSL sync is to slow. diff --git a/libs/test/TestComplete.cpp b/libs/test/TestComplete.cpp index 04777aecc..16aa24787 100644 --- a/libs/test/TestComplete.cpp +++ b/libs/test/TestComplete.cpp @@ -15,6 +15,7 @@ #include #include "ServerTestHarness.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/core/DurationTimer.hpp" #include "ecflow/node/Defs.hpp" @@ -45,8 +46,9 @@ BOOST_AUTO_TEST_SUITE(T_Complete) // hierarchically // ************************************************************************** BOOST_AUTO_TEST_CASE(test_complete) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_complete " << flush; TestClean clean_at_start_and_end; // Create the defs file corresponding to the text below @@ -100,8 +102,9 @@ BOOST_AUTO_TEST_CASE(test_complete) { } BOOST_AUTO_TEST_CASE(test_complete_does_not_hold) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_complete_does_not_hold " << flush; /// This test shows that a complete expression should not hold a node /// A complete should complete a node, and not hold it @@ -135,8 +138,9 @@ BOOST_AUTO_TEST_CASE(test_complete_does_not_hold) { } BOOST_AUTO_TEST_CASE(test_complete_with_empty_family) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_complete_with_empty_family " << flush; // Test a family with a complete expression and that has no children diff --git a/libs/test/TestCron.cpp b/libs/test/TestCron.cpp index d289e5c40..c8934113c 100644 --- a/libs/test/TestCron.cpp +++ b/libs/test/TestCron.cpp @@ -17,6 +17,7 @@ #include "ServerTestHarness.hpp" #include "TestFixture.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/core/AssertTimer.hpp" #include "ecflow/core/DurationTimer.hpp" @@ -69,8 +70,9 @@ static void wait_for_cron(int max_time_to_wait, const std::string& path) { } BOOST_AUTO_TEST_CASE(test_cron_time_series) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_cron_time_series " << flush; TestClean clean_at_start_and_end; // SLOW SYSTEMS diff --git a/libs/test/TestCtsWaitCmd.cpp b/libs/test/TestCtsWaitCmd.cpp index fb1258640..0e1eabd3d 100644 --- a/libs/test/TestCtsWaitCmd.cpp +++ b/libs/test/TestCtsWaitCmd.cpp @@ -16,6 +16,7 @@ #include "ServerTestHarness.hpp" #include "TestFixture.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/core/AssertTimer.hpp" #include "ecflow/core/DurationTimer.hpp" @@ -100,8 +101,9 @@ static bool wait_for_state(std::vector>& p // In this case the job associated with task 'wait' should block until the expression evaluates // to true, which should be after the completion of all other tasks BOOST_AUTO_TEST_CASE(test_wait_cmd) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_wait_cmd " << flush; TestClean clean_at_start_and_end; Defs theDefs; @@ -130,8 +132,9 @@ BOOST_AUTO_TEST_CASE(test_wait_cmd) { } BOOST_AUTO_TEST_CASE(test_wait_cmd_parse_fail) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_wait_cmd_parse_fail " << flush; // This time we add a wait expression that // should fail to parse, and we should return an error @@ -175,8 +178,9 @@ BOOST_AUTO_TEST_CASE(test_wait_cmd_parse_fail) { } BOOST_AUTO_TEST_CASE(test_wait_cmd_non_existant_paths) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_wait_cmd_non_existant_paths " << flush; // This time we add a wait expression that should fail // because the paths referenced in the expression don't exist diff --git a/libs/test/TestDayDate.cpp b/libs/test/TestDayDate.cpp index 11da4aab0..fc2b78a94 100644 --- a/libs/test/TestDayDate.cpp +++ b/libs/test/TestDayDate.cpp @@ -16,6 +16,7 @@ #include #include "ServerTestHarness.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/core/DurationTimer.hpp" #include "ecflow/node/Defs.hpp" @@ -33,9 +34,10 @@ BOOST_AUTO_TEST_SUITE(S_Test) BOOST_AUTO_TEST_SUITE(T_DayDate) BOOST_AUTO_TEST_CASE(test_day_at_midnight) { + ECF_NAME_THIS_TEST(); + // See ECFLOW-337 versus ECFLOW-1550 DurationTimer timer; - cout << "Test:: ...test_day_at_midnight " << flush; TestClean clean_at_start_and_end; // SLOW SYSTEMS @@ -88,9 +90,10 @@ BOOST_AUTO_TEST_CASE(test_day_at_midnight) { } BOOST_AUTO_TEST_CASE(test_date_at_midnight) { + ECF_NAME_THIS_TEST(); + // See ECFLOW-337 versus ECFLOW-1550 DurationTimer timer; - cout << "Test:: ...test_date_at_midnight " << flush; TestClean clean_at_start_and_end; // # Note: we have to use relative paths, since these tests are relocatable diff --git a/libs/test/TestEcfNoScriptCmd.cpp b/libs/test/TestEcfNoScriptCmd.cpp index 26280e081..10f31bfb9 100644 --- a/libs/test/TestEcfNoScriptCmd.cpp +++ b/libs/test/TestEcfNoScriptCmd.cpp @@ -15,6 +15,7 @@ #include #include "ServerTestHarness.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/core/DurationTimer.hpp" #include "ecflow/node/Defs.hpp" @@ -30,6 +31,8 @@ BOOST_AUTO_TEST_SUITE(S_Test) BOOST_AUTO_TEST_SUITE(T_EcfNoScriptCmd) BOOST_AUTO_TEST_CASE(test_ecf_no_script) { + ECF_NAME_THIS_TEST(); + // This test is used to case where we ONLY want to execute ECF_JOB_CMD WITHOUT processing .ecf script. // For this ECF_NO_SCRIPT must be set to any value. // The ECF_JOB_CMD must then encompass ecflow_client --init/complete and the environment settings @@ -37,7 +40,6 @@ BOOST_AUTO_TEST_CASE(test_ecf_no_script) { // Although ServerTestHarness creates the .ecf file, they are ignored when ECF_NO_SCRIPT is specified. DurationTimer timer; - cout << "Test:: ...test_ecf_no_script " << flush; TestClean clean_at_start_and_end; // Create the defs file corresponding to the text below diff --git a/libs/test/TestEcfScriptCmd.cpp b/libs/test/TestEcfScriptCmd.cpp index 8b95439c6..34c8d611a 100644 --- a/libs/test/TestEcfScriptCmd.cpp +++ b/libs/test/TestEcfScriptCmd.cpp @@ -16,6 +16,7 @@ #include "ServerTestHarness.hpp" #include "TestFixture.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/core/DurationTimer.hpp" #include "ecflow/core/File.hpp" @@ -32,8 +33,9 @@ BOOST_AUTO_TEST_SUITE(S_Test) BOOST_AUTO_TEST_SUITE(T_EcfScriptCmd) BOOST_AUTO_TEST_CASE(test_ECF_SCRIPT_CMD) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_ECF_SCRIPT_CMD " << flush; TestClean clean_at_start_and_end; // Create the defs file corresponding to the text below diff --git a/libs/test/TestEvents.cpp b/libs/test/TestEvents.cpp index 845efd8ec..4505f401f 100644 --- a/libs/test/TestEvents.cpp +++ b/libs/test/TestEvents.cpp @@ -16,6 +16,7 @@ #include "ServerTestHarness.hpp" #include "TestFixture.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/core/DurationTimer.hpp" #include "ecflow/node/Defs.hpp" @@ -36,8 +37,9 @@ BOOST_AUTO_TEST_SUITE(T_Events) // This test does not have any time dependencies in the def file. BOOST_AUTO_TEST_CASE(test_event_and_query) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_event_and_query " << flush; TestClean clean_at_start_and_end; // Create the defs file corresponding to the text below diff --git a/libs/test/TestFileCmd.cpp b/libs/test/TestFileCmd.cpp index f79f08118..2552bf179 100644 --- a/libs/test/TestFileCmd.cpp +++ b/libs/test/TestFileCmd.cpp @@ -14,6 +14,7 @@ #include "ServerTestHarness.hpp" #include "TestFixture.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/base/cts/user/CFileCmd.hpp" #include "ecflow/core/Converter.hpp" @@ -37,8 +38,9 @@ BOOST_AUTO_TEST_SUITE(S_Test) BOOST_AUTO_TEST_SUITE(T_FileCmd) BOOST_AUTO_TEST_CASE(test_file_cmd) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_file_cmd " << flush; TestClean clean_at_start_and_end; // Create the defs file corresponding to the text below diff --git a/libs/test/TestHandle.cpp b/libs/test/TestHandle.cpp index 25ce54b92..7e4b6d6fc 100644 --- a/libs/test/TestHandle.cpp +++ b/libs/test/TestHandle.cpp @@ -16,6 +16,7 @@ #include "ServerTestHarness.hpp" #include "TestFixture.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/base/cts/ClientToServerCmd.hpp" #include "ecflow/core/AssertTimer.hpp" @@ -42,8 +43,9 @@ BOOST_AUTO_TEST_SUITE(S_Test) BOOST_AUTO_TEST_SUITE(T_Handle) BOOST_AUTO_TEST_CASE(test_handle) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_handle " << flush; TestClean clean_at_start_and_end; Defs theDefs; @@ -195,8 +197,9 @@ BOOST_AUTO_TEST_CASE(test_handle) { } BOOST_AUTO_TEST_CASE(test_handle_sync) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_handle_sync " << flush; TestClean clean_at_start_and_end; Defs theDefs; @@ -333,8 +336,9 @@ BOOST_AUTO_TEST_CASE(test_handle_sync) { } BOOST_AUTO_TEST_CASE(test_handle_add_remove_add) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_handle_add_remove_add " << flush; TestClean clean_at_start_and_end; defs_ptr theDefs = Defs::create(); diff --git a/libs/test/TestInitAddVariable.cpp b/libs/test/TestInitAddVariable.cpp index da5a285ef..5921b7747 100644 --- a/libs/test/TestInitAddVariable.cpp +++ b/libs/test/TestInitAddVariable.cpp @@ -16,6 +16,7 @@ #include "ServerTestHarness.hpp" #include "TestFixture.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/core/Converter.hpp" #include "ecflow/core/DurationTimer.hpp" @@ -35,6 +36,8 @@ BOOST_AUTO_TEST_SUITE(T_InitAddVariable) // The data is created dynamically so that we can stress test the server // This test does not have any time dependencies in the def file. BOOST_AUTO_TEST_CASE(test_init_add_variable) { + ECF_NAME_THIS_TEST(); + // Added since in 5.2.0 (only 5.2.0 server supports this behaviour) if (getenv("ECF_DISABLE_TEST_FOR_OLD_SERVERS")) { std::cout << "\n Disable test_init_add_variable for old server , re-enable when 5.2.0 is minimum version\n"; @@ -42,7 +45,6 @@ BOOST_AUTO_TEST_CASE(test_init_add_variable) { } DurationTimer timer; - cout << "Test:: ...test_init_add_variable " << flush; TestClean clean_at_start_and_end; // # Note: we have to use relative paths, since these tests are relocatable diff --git a/libs/test/TestKillCmd.cpp b/libs/test/TestKillCmd.cpp index 324adc359..6ecf9d74a 100644 --- a/libs/test/TestKillCmd.cpp +++ b/libs/test/TestKillCmd.cpp @@ -14,6 +14,7 @@ #include "ServerTestHarness.hpp" #include "TestFixture.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/base/cts/ClientToServerCmd.hpp" #include "ecflow/core/AssertTimer.hpp" @@ -45,16 +46,18 @@ static bool waitForTaskState(NState::State state, int max_time_to_wait); // test:: test the kill command. Create a task that runs a long time // The associated job is then killed. This should leave task in aborted state BOOST_AUTO_TEST_CASE(test_kill_cmd) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_kill_cmd " << flush; TestClean clean_at_start_and_end; BOOST_REQUIRE_MESSAGE(kill_cmd(true), " kill of task '/test_kill_cmd/family/t0' failed"); cout << timer.duration() << "\n"; } BOOST_AUTO_TEST_CASE(test_hierarchical_kill_cmd) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_hierarchical_kill_cmd " << flush; TestClean clean_at_start_and_end; BOOST_REQUIRE_MESSAGE(kill_cmd(false), "kill of suite '/test_kill_cmd' failed"); cout << timer.duration() << "\n"; diff --git a/libs/test/TestLate.cpp b/libs/test/TestLate.cpp index b1c6ee97b..89c8e0a46 100644 --- a/libs/test/TestLate.cpp +++ b/libs/test/TestLate.cpp @@ -16,6 +16,7 @@ #include "ServerTestHarness.hpp" #include "TestFixture.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/LateAttr.hpp" #include "ecflow/base/cts/ClientToServerCmd.hpp" #include "ecflow/core/Converter.hpp" @@ -35,8 +36,9 @@ BOOST_AUTO_TEST_SUITE(S_Test) BOOST_AUTO_TEST_SUITE(T_Late) BOOST_AUTO_TEST_CASE(test_late) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_late " << flush; TestClean clean_at_start_and_end; /// This test will sleep longer than the job submission interval @@ -82,9 +84,10 @@ BOOST_AUTO_TEST_CASE(test_late) { } BOOST_AUTO_TEST_CASE(test_late_hierarchically) { + ECF_NAME_THIS_TEST(); + // ECFLOW-610 DurationTimer timer; - cout << "Test:: ...test_late_hierarchically " << flush; TestClean clean_at_start_and_end; /// This test will sleep longer than the job submission interval diff --git a/libs/test/TestLimit.cpp b/libs/test/TestLimit.cpp index 0889e7d93..2dd977570 100644 --- a/libs/test/TestLimit.cpp +++ b/libs/test/TestLimit.cpp @@ -15,6 +15,7 @@ #include #include "ServerTestHarness.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/core/Converter.hpp" #include "ecflow/core/DurationTimer.hpp" @@ -38,8 +39,9 @@ BOOST_AUTO_TEST_SUITE(T_Limit) // The data is created dynamically so that we can stress test the server // This test does not have any time dependencies in the def file. BOOST_AUTO_TEST_CASE(test_limit) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_limit " << flush; TestClean clean_at_start_and_end; // Create the defs file corresponding to the text below diff --git a/libs/test/TestOrderCmd.cpp b/libs/test/TestOrderCmd.cpp index 9f0319158..fe766e71b 100644 --- a/libs/test/TestOrderCmd.cpp +++ b/libs/test/TestOrderCmd.cpp @@ -16,6 +16,7 @@ #include "ServerTestHarness.hpp" #include "TestFixture.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/base/cts/ClientToServerCmd.hpp" #include "ecflow/core/AssertTimer.hpp" @@ -151,8 +152,9 @@ void test_ordering() { } BOOST_AUTO_TEST_CASE(test_change_order) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_change_order " << flush; TestClean clean_at_start_and_end; /// NOT: We *DONT* need to run the jobs for this TEST @@ -187,8 +189,9 @@ BOOST_AUTO_TEST_CASE(test_change_order) { } BOOST_AUTO_TEST_CASE(test_handle_change_order) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_handle_change_order " << flush; TestClean clean_at_start_and_end; std::vector str_a_b_c; diff --git a/libs/test/TestQueueCmd.cpp b/libs/test/TestQueueCmd.cpp index 43271cbd5..0eed5aa95 100644 --- a/libs/test/TestQueueCmd.cpp +++ b/libs/test/TestQueueCmd.cpp @@ -15,6 +15,7 @@ #include #include "ServerTestHarness.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/QueueAttr.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/core/DurationTimer.hpp" @@ -35,8 +36,9 @@ BOOST_AUTO_TEST_SUITE(T_QueueCmd) // This test does not have any time dependencies in the def file. BOOST_AUTO_TEST_CASE(test_queue) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_queue " << flush; TestClean clean_at_start_and_end; // Create the defs file corresponding to the text below diff --git a/libs/test/TestRepeat.cpp b/libs/test/TestRepeat.cpp index 351c9a5bb..02c50d05d 100644 --- a/libs/test/TestRepeat.cpp +++ b/libs/test/TestRepeat.cpp @@ -17,6 +17,7 @@ #include "ServerTestHarness.hpp" #include "TestFixture.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/base/WhyCmd.hpp" #include "ecflow/core/Converter.hpp" @@ -41,8 +42,9 @@ BOOST_AUTO_TEST_SUITE(T_Repeat) // The data is created dynamically so that we can stress test the server // This test does not have any time dependencies in the def file. BOOST_AUTO_TEST_CASE(test_repeat_integer) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_repeat_integer " << flush; TestClean clean_at_start_and_end; // ******************************************************************************** @@ -95,8 +97,9 @@ BOOST_AUTO_TEST_CASE(test_repeat_integer) { } BOOST_AUTO_TEST_CASE(test_repeat_date) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_repeat_date " << flush; TestClean clean_at_start_and_end; // ******************************************************************************** @@ -132,8 +135,9 @@ BOOST_AUTO_TEST_CASE(test_repeat_date) { } BOOST_AUTO_TEST_CASE(test_repeat_date_list) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_repeat_date_list " << flush; TestClean clean_at_start_and_end; // ******************************************************************************** @@ -169,8 +173,9 @@ BOOST_AUTO_TEST_CASE(test_repeat_date_list) { } BOOST_AUTO_TEST_CASE(test_repeat_enumerator) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_repeat_enumerator " << flush; TestClean clean_at_start_and_end; // ******************************************************************************** @@ -211,8 +216,9 @@ BOOST_AUTO_TEST_CASE(test_repeat_enumerator) { } BOOST_AUTO_TEST_CASE(test_repeat_defstatus) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_repeat_defstatus " << flush; TestClean clean_at_start_and_end; // TEST SHOULD COMPLETE STRAIGHT AWAY SINCE WE HAVE A DEFSTATUS COMPLETE @@ -256,12 +262,13 @@ BOOST_AUTO_TEST_CASE(test_repeat_defstatus) { // #define DEBUG_ME 1 BOOST_AUTO_TEST_CASE(test_repeat_clears_user_edit) { + ECF_NAME_THIS_TEST(); + // Tests code:: Node::requeueOrSetMostSignificantStateUpNodeTree() // In *PARTICULAR* THE REQUE caused by the repeat, this ensures we clear NO_REQUE_IF_SINGLE_TIME_DEP // So that the effect of manual run/force complete are negated via automated re-queue caused by a REPEAT DurationTimer timer; - cout << "Test:: ...test_repeat_clears_user_edit " << flush; TestClean clean_at_start_and_end; // # Note: we have to use relative paths, since these tests are relocatable diff --git a/libs/test/TestRequeueNode.cpp b/libs/test/TestRequeueNode.cpp index fdb403390..f483f2897 100644 --- a/libs/test/TestRequeueNode.cpp +++ b/libs/test/TestRequeueNode.cpp @@ -16,6 +16,7 @@ #include "ServerTestHarness.hpp" #include "TestFixture.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/core/Converter.hpp" #include "ecflow/core/DurationTimer.hpp" @@ -33,8 +34,9 @@ BOOST_AUTO_TEST_SUITE(S_Test) BOOST_AUTO_TEST_SUITE(T_RequeueNode) BOOST_AUTO_TEST_CASE(test_requeue_node) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_requeue_node " << flush; TestClean clean_at_start_and_end; // Create the defs file corresponding to the text below diff --git a/libs/test/TestServer.cpp b/libs/test/TestServer.cpp index 9f0f36c94..b398842f0 100644 --- a/libs/test/TestServer.cpp +++ b/libs/test/TestServer.cpp @@ -16,6 +16,7 @@ #include "ServerTestHarness.hpp" #include "TestFixture.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/core/Converter.hpp" #include "ecflow/core/DurationTimer.hpp" @@ -37,8 +38,9 @@ BOOST_AUTO_TEST_SUITE(T_Server) // The data is created dynamically so that we can stress test the server // This test does not have any time dependencies in the def file. BOOST_AUTO_TEST_CASE(test_server_job_submission) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_server_job_submission " << flush; TestClean clean_at_start_and_end; // # Note: we have to use relative paths, since these tests are relocatable @@ -70,8 +72,9 @@ BOOST_AUTO_TEST_CASE(test_server_job_submission) { } BOOST_AUTO_TEST_CASE(test_restore_defs_from_check_pt) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_restore_defs_from_check_pt " << flush; TestClean clean_at_start_and_end; // ********************************************************************** // In order for this test to work, we need to disable the automatic diff --git a/libs/test/TestSingle.cpp b/libs/test/TestSingle.cpp index b557bd0bf..f4be9ed74 100644 --- a/libs/test/TestSingle.cpp +++ b/libs/test/TestSingle.cpp @@ -128,14 +128,14 @@ BOOST_AUTO_TEST_CASE(test_stress) { // Be sure to comment out defstatus suspended in mega.def // BOOST_AUTO_TEST_CASE( test_mega_def ) //{ +// ECF_NAME_THIS_TEST(); +// // DurationTimer timer; // // // location to mega.def and left over log file // std::string log_file = File::test_data("libs/node/parser/test/data/single_defs/mega.def_log","parser"); // std::string path = File::test_data("libs/node/parser/test/data/single_defs/mega.def","parser"); // -// cout << "Test:: ..." << path << " log file: " << log_file << flush; -// // // Remove the log file. // fs::remove(log_file); // @@ -156,8 +156,9 @@ BOOST_AUTO_TEST_CASE(test_stress) { // This is used to test with thousands of labels // BOOST_AUTO_TEST_CASE( test_large_client_labels_calls ) //{ +// ECF_NAME_THIS_TEST(); +// // DurationTimer timer; -// cout << "Test:: ...test_large_client_labels_calls "<< flush; // TestClean clean_at_start_and_end; // // //# Note: we have to use relative paths, since these tests are relocatable @@ -222,9 +223,9 @@ BOOST_AUTO_TEST_CASE(test_stress) { /// 5000 29 800 /// 6000 37 900 // void time_for_tasks(int tasks) { +// ECF_NAME_THIS_TEST(); // // std::string test_name = "test_stress_" + ecf::convert_to(tasks); -// cout << "Test:: ..." << test_name << flush; // // Defs theDefs; // { diff --git a/libs/test/TestSpecificIssues.cpp b/libs/test/TestSpecificIssues.cpp index 5f3ea633a..d16a96b4e 100644 --- a/libs/test/TestSpecificIssues.cpp +++ b/libs/test/TestSpecificIssues.cpp @@ -16,6 +16,7 @@ #include "ServerTestHarness.hpp" #include "TestFixture.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/core/DurationTimer.hpp" #include "ecflow/node/Defs.hpp" @@ -30,10 +31,11 @@ BOOST_AUTO_TEST_SUITE(S_Test) BOOST_AUTO_TEST_SUITE(T_SpecificIssues) BOOST_AUTO_TEST_CASE(test_ECFLOW_1589) { + ECF_NAME_THIS_TEST(); + // Test ECF_JOB_CMD where task *completes* but the ECF_JOB_CMD still fails. i.e ECFLOW-1589 DurationTimer timer; - cout << "Test:: ...test_ECFLOW_1589 " << flush; TestClean clean_at_start_and_end; // Create the defs file corresponding to the text below diff --git a/libs/test/TestSuspend.cpp b/libs/test/TestSuspend.cpp index 7cd3ea161..99cb1a914 100644 --- a/libs/test/TestSuspend.cpp +++ b/libs/test/TestSuspend.cpp @@ -17,6 +17,7 @@ #include "ServerTestHarness.hpp" #include "TestFixture.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/core/AssertTimer.hpp" #include "ecflow/core/Converter.hpp" @@ -78,8 +79,9 @@ static void waitForTimeDependenciesToBeFree(int max_time_to_wait) { // be handled. When the server/node is restarted/resumed the task should // be submitted straight away.(i.e providing no trigger/complete dependencies) BOOST_AUTO_TEST_CASE(test_shutdown) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_shutdown " << flush; TestClean clean_at_start_and_end; // Create the defs file corresponding to the text below @@ -158,8 +160,9 @@ BOOST_AUTO_TEST_CASE(test_shutdown) { // be handled. When the server/node is restarted/resumed the task should // be submitted straight away.(i.e providing no trigger/complete dependencies) BOOST_AUTO_TEST_CASE(test_suspend_node) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_suspend_node " << flush; TestClean clean_at_start_and_end; // Create the defs file corresponding to the text below diff --git a/libs/test/TestTime.cpp b/libs/test/TestTime.cpp index 4ce3537db..31c8a5440 100644 --- a/libs/test/TestTime.cpp +++ b/libs/test/TestTime.cpp @@ -17,6 +17,7 @@ #include "ServerTestHarness.hpp" #include "TestFixture.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/core/Converter.hpp" #include "ecflow/core/DurationTimer.hpp" @@ -36,8 +37,9 @@ BOOST_AUTO_TEST_SUITE(S_Test) BOOST_AUTO_TEST_SUITE(T_Time) BOOST_AUTO_TEST_CASE(test_single_real_time) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_single_real_time " << flush; TestClean clean_at_start_and_end; // Create the defs file corresponding to the text below @@ -93,9 +95,10 @@ BOOST_AUTO_TEST_CASE(test_single_real_time) { } BOOST_AUTO_TEST_CASE(test_single_time_trigger) { + ECF_NAME_THIS_TEST(); + // ECFLOW-833 DurationTimer timer; - cout << "Test:: ...test_single_time_trigger " << flush; TestClean clean_at_start_and_end; // Create the defs file corresponding to the text below @@ -153,8 +156,9 @@ BOOST_AUTO_TEST_CASE(test_single_time_trigger) { } BOOST_AUTO_TEST_CASE(test_time_multiple_single_slot) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_time_multiple_single_slot " << flush; TestClean clean_at_start_and_end; // SLOW SYSTEMS @@ -206,8 +210,9 @@ BOOST_AUTO_TEST_CASE(test_time_multiple_single_slot) { } BOOST_AUTO_TEST_CASE(test_time_relative_time_series) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_time_relative_time_series " << flush; TestClean clean_at_start_and_end; // SLOW SYSTEMS @@ -252,8 +257,9 @@ BOOST_AUTO_TEST_CASE(test_time_relative_time_series) { } BOOST_AUTO_TEST_CASE(test_time_real_series) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_time_real_series " << flush; TestClean clean_at_start_and_end; // SLOW SYSTEMS @@ -309,8 +315,9 @@ BOOST_AUTO_TEST_CASE(test_time_real_series) { } BOOST_AUTO_TEST_CASE(test_single_real_time_near_midnight) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_single_real_time_near_midnight " << flush; TestClean clean_at_start_and_end; // # Note: we have to use relative paths, since these tests are relocatable @@ -360,8 +367,9 @@ BOOST_AUTO_TEST_CASE(test_single_real_time_near_midnight) { } BOOST_AUTO_TEST_CASE(test_time_real_series_near_midnight) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_time_real_series_near_midnight " << flush; int the_server_version = TestFixture::server_version(); if (the_server_version == 403) { cout << " SKIPPING, This test does not work with 403, current server version is " << the_server_version << "\n"; diff --git a/libs/test/TestToday.cpp b/libs/test/TestToday.cpp index d4d585ce8..2fe3232ba 100644 --- a/libs/test/TestToday.cpp +++ b/libs/test/TestToday.cpp @@ -17,6 +17,7 @@ #include "ServerTestHarness.hpp" #include "TestFixture.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/core/Converter.hpp" #include "ecflow/core/DurationTimer.hpp" @@ -37,8 +38,9 @@ BOOST_AUTO_TEST_SUITE(T_Today) // In the test case we will dynamically create all the test data. // The data is created dynamically so that we can stress test the server BOOST_AUTO_TEST_CASE(test_today_single_slot) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_today_single_slot " << flush; TestClean clean_at_start_and_end; // ************************************************************************** @@ -90,8 +92,9 @@ BOOST_AUTO_TEST_CASE(test_today_single_slot) { } BOOST_AUTO_TEST_CASE(test_today_relative_time_series) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_today_relative_time_series " << flush; TestClean clean_at_start_and_end; // SLOW SYSTEMS @@ -136,8 +139,9 @@ BOOST_AUTO_TEST_CASE(test_today_relative_time_series) { } BOOST_AUTO_TEST_CASE(test_today_real_time_series) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_today_real_time_series " << flush; TestClean clean_at_start_and_end; // SLOW SYSTEMS diff --git a/libs/test/TestTrigger.cpp b/libs/test/TestTrigger.cpp index a385115be..ca33cbae9 100644 --- a/libs/test/TestTrigger.cpp +++ b/libs/test/TestTrigger.cpp @@ -15,6 +15,7 @@ #include #include "ServerTestHarness.hpp" +#include "TestNaming.hpp" #include "ecflow/attribute/VerifyAttr.hpp" #include "ecflow/core/Converter.hpp" #include "ecflow/core/DurationTimer.hpp" @@ -36,8 +37,9 @@ BOOST_AUTO_TEST_SUITE(T_Trigger) // The data is created dynamically so that we can stress test the server // This test does not have any time dependencies in the def file. BOOST_AUTO_TEST_CASE(test_triggers_and_meters) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_triggers_and_meters " << flush; TestClean clean_at_start_and_end; // # Note: we have to use relative paths, since these tests are relocatable @@ -84,10 +86,11 @@ BOOST_AUTO_TEST_CASE(test_triggers_and_meters) { } BOOST_AUTO_TEST_CASE(test_triggers_with_limits) { + ECF_NAME_THIS_TEST(); + // One family is in the limits, another is without. Bit of hack // But shows use of limits in triggers DurationTimer timer; - cout << "Test:: ...test_triggers_with_limits " << flush; TestClean clean_at_start_and_end; // # Note: we have to use relative paths, since these tests are relocatable diff --git a/libs/test/TestWhyCmd.cpp b/libs/test/TestWhyCmd.cpp index a747d5a5e..fe357f45b 100644 --- a/libs/test/TestWhyCmd.cpp +++ b/libs/test/TestWhyCmd.cpp @@ -15,6 +15,7 @@ #include "ServerTestHarness.hpp" #include "TestFixture.hpp" +#include "TestNaming.hpp" #include "ecflow/base/WhyCmd.hpp" #include "ecflow/base/cts/ClientToServerCmd.hpp" #include "ecflow/core/AssertTimer.hpp" @@ -74,8 +75,9 @@ static unsigned int waitForWhy(const std::string& path, const std::string& why, } BOOST_AUTO_TEST_CASE(test_why_day) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_why_day " << flush; TestClean clean_at_start_and_end; Defs theDefs; @@ -111,8 +113,9 @@ BOOST_AUTO_TEST_CASE(test_why_day) { } BOOST_AUTO_TEST_CASE(test_why_date) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_why_date " << flush; Defs theDefs; { @@ -146,8 +149,9 @@ BOOST_AUTO_TEST_CASE(test_why_date) { } BOOST_AUTO_TEST_CASE(test_why_time) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_why_time " << flush; Defs theDefs; { @@ -181,8 +185,9 @@ BOOST_AUTO_TEST_CASE(test_why_time) { } BOOST_AUTO_TEST_CASE(test_why_today) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_why_today " << flush; Defs theDefs; { @@ -225,8 +230,9 @@ BOOST_AUTO_TEST_CASE(test_why_today) { } BOOST_AUTO_TEST_CASE(test_why_cron) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_why_cron " << flush; Defs theDefs; { @@ -283,8 +289,9 @@ BOOST_AUTO_TEST_CASE(test_why_cron) { } BOOST_AUTO_TEST_CASE(test_why_limit) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_why_limit " << flush; // Testing for limits requires that we have least some jobs are submitted. // we need to kill these jobs, at the end of test. @@ -362,8 +369,9 @@ BOOST_AUTO_TEST_CASE(test_why_limit) { } BOOST_AUTO_TEST_CASE(test_why_trigger) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_why_trigger " << flush; Defs theDefs; { @@ -389,8 +397,9 @@ BOOST_AUTO_TEST_CASE(test_why_trigger) { } BOOST_AUTO_TEST_CASE(test_why_meter) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_why_meter " << flush; Defs theDefs; { @@ -417,8 +426,9 @@ BOOST_AUTO_TEST_CASE(test_why_meter) { } BOOST_AUTO_TEST_CASE(test_why_event) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_why_event " << flush; Defs theDefs; { @@ -449,8 +459,9 @@ BOOST_AUTO_TEST_CASE(test_why_event) { } BOOST_AUTO_TEST_CASE(test_why_user_var) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_why_user_var " << flush; Defs theDefs; { @@ -477,8 +488,9 @@ BOOST_AUTO_TEST_CASE(test_why_user_var) { } BOOST_AUTO_TEST_CASE(test_why_gen_var) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_why_gen_var " << flush; Defs theDefs; { @@ -505,8 +517,9 @@ BOOST_AUTO_TEST_CASE(test_why_gen_var) { } BOOST_AUTO_TEST_CASE(test_why_repeat) { + ECF_NAME_THIS_TEST(); + DurationTimer timer; - cout << "Test:: ...test_why_repeat " << flush; Defs theDefs; { diff --git a/libs/test/TestZombies.cpp b/libs/test/TestZombies.cpp index 71eb4d991..f1c694e74 100644 --- a/libs/test/TestZombies.cpp +++ b/libs/test/TestZombies.cpp @@ -16,6 +16,7 @@ #include "ServerTestHarness.hpp" #include "TestFixture.hpp" +#include "TestNaming.hpp" #include "ZombieUtil.hpp" #include "ecflow/core/AssertTimer.hpp" #include "ecflow/core/Child.hpp" @@ -643,16 +644,17 @@ BOOST_AUTO_TEST_CASE(enable_debug_for_ECF_TRY_NO_Greater_than_one) { if (getenv("ECF_DEBUG_ZOMBIES")) { ecf_debug_enabled = true; - cout << "Test:: ... debug_enabled" << endl; + ECF_NAME_THIS_TEST(); } } #ifdef DO_TEST1 BOOST_AUTO_TEST_CASE(test_path_zombie_creation) { + ECF_NAME_THIS_TEST(); + if (ecf_debug_enabled) std::cout << "\n\n=============================================================================\n"; DurationTimer timer; - cout << "Test:: ...test_path_zombie_creation " << flush; if (ecf_debug_enabled) cout << "\n"; TestClean clean_at_start_and_end; @@ -694,10 +696,11 @@ BOOST_AUTO_TEST_CASE(test_path_zombie_creation) { #ifdef DO_TEST2 BOOST_AUTO_TEST_CASE(test_user_zombies_for_delete_fob) { + ECF_NAME_THIS_TEST(); + if (ecf_debug_enabled) std::cout << "\n\n=============================================================================\n"; DurationTimer timer; - cout << "Test:: ...test_user_zombies_for_delete_fob " << flush; if (ecf_debug_enabled) cout << "\n"; TestClean clean_at_start_and_end; @@ -732,10 +735,11 @@ BOOST_AUTO_TEST_CASE(test_user_zombies_for_delete_fob) { #ifdef DO_TEST3 BOOST_AUTO_TEST_CASE(test_user_zombies_for_delete_fail) { + ECF_NAME_THIS_TEST(); + if (ecf_debug_enabled) std::cout << "\n\n=============================================================================\n"; DurationTimer timer; - cout << "Test:: ...test_user_zombies_for_delete_fail " << flush; if (ecf_debug_enabled) cout << "\n"; TestClean clean_at_start_and_end; @@ -764,10 +768,11 @@ BOOST_AUTO_TEST_CASE(test_user_zombies_for_delete_fail) { #ifdef DO_TEST4 BOOST_AUTO_TEST_CASE(test_user_zombies_for_begin) { + ECF_NAME_THIS_TEST(); + if (ecf_debug_enabled) std::cout << "\n\n=============================================================================\n"; DurationTimer timer; - cout << "Test:: ...test_user_zombies_for_begin " << flush; if (ecf_debug_enabled) cout << "\n"; TestClean clean_at_start_and_end; @@ -808,11 +813,12 @@ BOOST_AUTO_TEST_CASE(test_user_zombies_for_begin) { #ifdef DO_TEST5 BOOST_AUTO_TEST_CASE(test_zombies_attr) { + ECF_NAME_THIS_TEST(); + if (ecf_debug_enabled) std::cout << "\n\n=============================================================================\n"; DurationTimer timer; std::string suite_name = "test_zombies_attr"; - cout << "Test:: ..." << suite_name << " " << flush; if (ecf_debug_enabled) cout << "\n"; TestClean clean_at_start_and_end; @@ -848,11 +854,12 @@ BOOST_AUTO_TEST_CASE(test_zombies_attr) { #ifdef DO_TEST6 BOOST_AUTO_TEST_CASE(test_user_zombies_for_adopt) { + ECF_NAME_THIS_TEST(); + if (ecf_debug_enabled) std::cout << "\n\n=============================================================================\n"; DurationTimer timer; std::string suite_name = "test_user_zombies_for_adopt"; - cout << "Test:: ..." << suite_name << " " << flush; if (ecf_debug_enabled) cout << "\n"; TestClean clean_at_start_and_end; @@ -892,13 +899,12 @@ BOOST_AUTO_TEST_CASE(test_user_zombies_for_adopt) { #ifdef DO_TEST7 BOOST_AUTO_TEST_CASE(test_zombies_attr_for_adopt) { + std::string suite_name = "test_zombies_attr_for_adopt"; + ECF_NAME_THIS_TEST(<< ", using suite: " << suite_name); + if (ecf_debug_enabled) std::cout << "\n\n=============================================================================\n"; DurationTimer timer; - std::string suite_name = "test_zombies_attr_for_adopt"; - cout << "Test:: ..." << suite_name << " " << flush; - if (ecf_debug_enabled) - cout << "\n"; TestClean clean_at_start_and_end; // This command creates user zombies up front, these may not have a pid, if task in submitted state @@ -938,13 +944,12 @@ BOOST_AUTO_TEST_CASE(test_zombies_attr_for_adopt) { #ifdef DO_TEST8 BOOST_AUTO_TEST_CASE(test_user_zombie_creation_via_complete) { + std::string suite_name = "test_zombies_attr_for_adopt"; + ECF_NAME_THIS_TEST(<< ", using suite: " << suite_name); + if (ecf_debug_enabled) std::cout << "\n\n=============================================================================\n"; DurationTimer timer; - std::string suite_name = "test_user_zombie_creation_via_complete"; - cout << "Test:: ..." << suite_name << " " << flush; - if (ecf_debug_enabled) - cout << "\n"; TestClean clean_at_start_and_end; // This command creates user zombies up front, these may not have a pid, if task in submitted state @@ -965,13 +970,12 @@ BOOST_AUTO_TEST_CASE(test_user_zombie_creation_via_complete) { #ifdef DO_TEST9 BOOST_AUTO_TEST_CASE(test_user_zombie_creation_via_abort) { + std::string suite_name = "test_user_zombie_creation_via_abort"; + ECF_NAME_THIS_TEST(<< ", using suite: " << suite_name); + if (ecf_debug_enabled) std::cout << "\n\n=============================================================================\n"; DurationTimer timer; - std::string suite_name = "test_user_zombie_creation_via_abort"; - cout << "Test:: ..." << suite_name << " " << flush; - if (ecf_debug_enabled) - cout << "\n"; TestClean clean_at_start_and_end; // This command creates user zombies up front, these may not have a pid, if task in submitted state @@ -992,13 +996,12 @@ BOOST_AUTO_TEST_CASE(test_user_zombie_creation_via_abort) { #ifdef DO_TEST10 BOOST_AUTO_TEST_CASE(test_zombie_inheritance) { + std::string suite_name = "test_zombie_inheritance"; + ECF_NAME_THIS_TEST(<< ", using suite: " << suite_name); + if (ecf_debug_enabled) std::cout << "\n\n=============================================================================\n"; DurationTimer timer; - std::string suite_name = "test_zombie_inheritance"; - cout << "Test:: ..." << suite_name << " " << flush; - if (ecf_debug_enabled) - cout << "\n"; TestClean clean_at_start_and_end; // Add zombie attribute, make sure it inherited @@ -1065,13 +1068,12 @@ static int wait_for_killed_zombies(int no_of_tasks, int max_time_to_wait) { } BOOST_AUTO_TEST_CASE(test_zombie_kill) { + std::string suite_name = "test_zombie_kill"; + ECF_NAME_THIS_TEST(<< ", using suite: " << suite_name); + if (ecf_debug_enabled) std::cout << "\n\n=============================================================================\n"; DurationTimer timer; - std::string suite_name = "test_zombie_kill"; - cout << "Test:: ..." << suite_name << " " << flush; - if (ecf_debug_enabled) - cout << "\n"; TestClean clean_at_start_and_end; // This command creates user zombies up front, these may not have a pid, if task in submitted state @@ -1183,13 +1185,12 @@ static void remove_all_user_zombies() { dump_zombies(); } BOOST_AUTO_TEST_CASE(test_ecf_zombie_type_creation) { + std::string suite_name = "test_ecf_zombie_type_creation"; + ECF_NAME_THIS_TEST(<< ", using suite: " << suite_name); + if (ecf_debug_enabled) std::cout << "\n\n=============================================================================\n"; DurationTimer timer; - std::string suite_name = "test_ecf_zombie_type_creation"; - cout << "Test:: ..." << suite_name << " " << flush; - if (ecf_debug_enabled) - cout << "\n"; TestClean clean_at_start_and_end; // some systems are really quick, where tasks are already active, when we make them zombies, then the next