Bug#36253070 Router tests are failing on mac14 on pb2

Andrzej Religa · Andrzej Religa · commit 2933b82b068a · 2024-02-05T15:31:18.000+01:00
Post-push fix:
-reenabled corefiles on macoOS
-initializing the logger in mysql_mock_server before the singal handler
 to avoid std::exception when it logs
-removing the NOTE about failed setrlimit from the process output to avoid
 failures caused by it's random occurences

Change-Id: If129580c86cb9261edaf1433ce33b9ed6135584f
diff --git a/router/src/mock_server/src/main.cc b/router/src/mock_server/src/main.cc
@@ -120,14 +120,6 @@ class MysqlServerMockFrontend {
   bool is_print_and_exit() { return do_print_and_exit_; }
 
   void run() {
-    signal_handler_.register_ignored_signals_handler();
-    signal_handler_.block_all_nonfatal_signals();
-    signal_handler_.register_fatal_signal_handler(config_.core_file);
-    signal_handler_.spawn_signal_handler_thread();
-#ifdef _WIN32
-    signal_handler_.register_ctrl_c_handler();
-#endif
-
     init_DIM();
     std::unique_ptr<mysql_harness::LoaderConfig> loader_config(
         new mysql_harness::LoaderConfig(mysql_harness::Config::allow_keys));
@@ -168,6 +160,15 @@ class MysqlServerMockFrontend {
     const std::string logfile_name = "mock_server_" + config_.port + ".log";
     logger_conf.add("filename", logfile_name);
 
+    // initialize the signal handler
+    signal_handler_.register_ignored_signals_handler();
+    signal_handler_.block_all_nonfatal_signals();
+    signal_handler_.register_fatal_signal_handler(config_.core_file);
+    signal_handler_.spawn_signal_handler_thread();
+#ifdef _WIN32
+    signal_handler_.register_ctrl_c_handler();
+#endif
+
     // assume all path relative to the installed binary
     auto plugin_dir = mysql_harness::get_plugin_dir(origin_dir_.str());
     loader_config->set_default("plugin_folder", plugin_dir);
diff --git a/router/tests/component/test_mock_server.cc b/router/tests/component/test_mock_server.cc
@@ -1090,13 +1090,6 @@ struct MockServerCoreTestParam {
   ExitStatus expected_exit_status_;
 };
 
-#ifndef __APPLE__
-// enabling core dump on pb2 macos14 causes random (but often):
-// MySQLRouter:
-//    NOTE: core-file requested, but resource-limits say core-files are
-//    disabled for this process ('ulimit -c' is '0')
-// mysql_mock_server:
-//    std::exception
 class MockServerCoreTest
     : public RouterComponentTest,
       public ::testing::WithParamInterface<MockServerCoreTestParam> {};
@@ -1188,8 +1181,6 @@ INSTANTIATE_TEST_SUITE_P(Spec, MockServerCoreTest,
                          ::testing::ValuesIn(mock_server_core_test_param),
                          [](const auto &info) { return info.param.test_name; });
 
-#endif  // __APPLE__
-
 // session-tracker
 
 struct MockServerCommandTestParam {
diff --git a/router/tests/component/test_pidfile.cc b/router/tests/component/test_pidfile.cc
@@ -479,19 +479,19 @@ INSTANTIATE_TEST_SUITE_P(
         // shell does, so this should be identical to the quoted TS_FR10_02
         // case.
         PidFileOptionErrorParams(
-            "", "^Error: Invalid empty value for --pid-file option"),
+            "", "Error: Invalid empty value for --pid-file option"),
         // readonly dir : TS_FR11_01 (M)
         PidFileOptionErrorParams(
             mysql_harness::Path(FOO).join(READONLY_FOLDER).c_str(),
-            "^Error: Failed writing PID to .*/foo/readonly':.*"),
+            "Error: Failed writing PID to .*/foo/readonly':.*"),
         // readonly file : TS_FR11_02 (M)
         PidFileOptionErrorParams(
             mysql_harness::Path(FOO).join(READONLY_FILE).c_str(),
-            "^Error: Failed writing PID to .*/foo/readonly.pid':.*"),
+            "Error: Failed writing PID to .*/foo/readonly.pid':.*"),
         // nonexisting dir : TS_FR11_03 (M)
         PidFileOptionErrorParams(
             mysql_harness::Path(FOO).join(NONEXISTING).join(PIDFILE).c_str(),
-            "^Error: Failed writing PID to "
+            "Error: Failed writing PID to "
             ".*/foo/nonexisting/mysqlrouter.pid':.*")));
 
 /**
@@ -587,7 +587,7 @@ TEST_P(RouterPidfileOptionCfgValueTestError, PidFileOptionCfgValueTestError) {
 
   // expect error
   EXPECT_TRUE(
-      router.expect_output("^Error: PID filename '.*' is illegal", true));
+      router.expect_output("Error: PID filename '.*' is illegal", true));
 }
 
 INSTANTIATE_TEST_SUITE_P(PidFileOptionCfgValueTestError,
@@ -631,7 +631,7 @@ TEST_P(RouterPidfileOptionEnvValueTestError, PidFileOptionEnvValueTestError) {
 
   // expect error
   EXPECT_TRUE(
-      router.expect_output("^Error: PID filename '.*' is illegal", true));
+      router.expect_output("Error: PID filename '.*' is illegal", true));
 }
 
 INSTANTIATE_TEST_SUITE_P(PidFileOptionEnvValueTestError,
@@ -784,7 +784,7 @@ INSTANTIATE_TEST_SUITE_P(PidFileOptionSupremacyCornerCaseTest,
                              // empty value : TS_FR03_02
                              PidFileOptionSupremacyCornerCaseParams(
                                  "pid_file = ",
-                                 "^Error: PID filename '.*' is illegal.")));
+                                 "Error: PID filename '.*' is illegal.")));
 
 /**
  * @test
@@ -840,8 +840,8 @@ TEST_P(RouterPidfileOptionExistsTest, PidFileOptionExistsTest) {
   }
 
   // expect error
-  EXPECT_TRUE(router.expect_output(
-      "^Error: PID file .* found. Already running?", true));
+  EXPECT_TRUE(
+      router.expect_output("Error: PID file .* found. Already running?", true));
 
   // pid-file still exists
   EXPECT_TRUE(fullpath.exists()) << fullpath.str();
diff --git a/router/tests/component/test_router_stacktrace.cc b/router/tests/component/test_router_stacktrace.cc
@@ -45,8 +45,6 @@
 #include "test/temp_directory.h"
 
 namespace {
-
-#ifndef __APPLE__
 constexpr const int abrt_status{
 #ifdef _WIN32
     0x00000102  // STATUS_TIMEOUT
@@ -65,7 +63,6 @@ constexpr const int segv_status{
 #endif
 };
 
-#endif
 #endif
 
 }  // namespace
@@ -91,14 +88,6 @@ TEST_F(RouterStacktraceTest, help_has_core_file) {
   EXPECT_THAT(r.get_full_output(), ::testing::HasSubstr("  --core-file"));
 }
 
-#ifndef __APPLE__
-// enabling core dump on pb2 macos14 causes random (but often):
-// MySQLRouter:
-//    NOTE: core-file requested, but resource-limits say core-files are
-//    disabled for this process ('ulimit -c' is '0')
-// mysql_mock_server:
-//    std::exception
-
 // TS_1_2
 TEST_F(RouterStacktraceTest, bootstrap_with_core_file) {
   auto mock_port = port_pool_.get_next_available();
@@ -583,8 +572,6 @@ TEST_F(RouterStacktraceTest, core_file_0) {
 
 #endif  // !defined(HAVE_ASAN) && !defined(HAVE_UBSAN)
 
-#endif  // __APPLE__
-
 int main(int argc, char *argv[]) {
   init_windows_sockets();
   ProcessManager::set_origin(Path(argv[0]).dirname());
diff --git a/router/tests/helpers/process_manager.h b/router/tests/helpers/process_manager.h
@@ -120,19 +120,8 @@ class ProcessManager {
       return *this;
     }
 
-    Spawner &with_core_dump([[maybe_unused]] bool dump_core) {
-#ifndef __APPLE__
+    Spawner &with_core_dump(bool dump_core) {
       with_core_ = dump_core;
-#else
-      // enabling core dump on pb2 macos14 causes random (but often):
-      // MySQLRouter:
-      //    NOTE: core-file requested, but resource-limits say core-files are
-      //    disabled for this process ('ulimit -c' is '0')
-      // mysql_mock_server:
-      //    std::exception
-      with_core_ = false;
-#endif
-
       return *this;
     }
 
diff --git a/router/tests/helpers/process_wrapper.h b/router/tests/helpers/process_wrapper.h
@@ -25,6 +25,8 @@
 #ifndef _PROCESS_WRAPPER_H_
 #define _PROCESS_WRAPPER_H_
 
+#include "mysql/harness/string_utils.h"    // split_string
+#include "mysql/harness/utility/string.h"  // starts_with
 #include "process_launcher.h"
 #include "router_test_helpers.h"
 
@@ -87,8 +89,38 @@ class ProcessWrapper {
    *         of calling this method.
    */
   std::string get_full_output() {
-    std::lock_guard<std::mutex> output_lock(output_mtx_);
-    return execute_output_raw_;
+    using mysql_harness::utility::starts_with;
+    std::vector<std::string> lines;
+    std::string result;
+
+    {
+      std::lock_guard<std::mutex> output_lock(output_mtx_);
+      lines = mysql_harness::split_string(execute_output_raw_, '\n');
+    }
+
+    if (lines.size() > 1) {
+      // remove last empty line
+      lines.pop_back();
+    }
+
+    bool core_file_req_failed{false};
+    for (const std::string &line : lines) {
+      // setrlimit sometimes fails on pb2 macos, resulting in additional,
+      // unwanted console output that we remove here
+      if (starts_with(line,
+                      "NOTE: core-file requested, but resource-limits say")) {
+        core_file_req_failed = true;
+        continue;
+      }
+      if (core_file_req_failed &&
+          starts_with(line, "stopping to log to the console") &&
+          lines.size() == 2) {
+        continue;
+      }
+      result += (line + "\n");
+    }
+
+    return result;
   }
 
   /** @brief returns the content of the process app logfile as a string
