Merge pull request #3789 from canonical/fix-basic-process-tests

Fix basic process tests on Windows
canonical · Dec 13, 2024 · a516c93 · a516c93
2 parents 11e0ac9 + 3799f30
commit a516c93
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/tests/mock_process.cpp b/tests/mock_process.cpp
@@ -2,12 +2,22 @@
 #include <iostream>
 #include <string>
 
+[[noreturn]] void crash()
+{
+#ifdef MULTIPASS_PLATFORM_WINDOWS
+    // Prevent Windows from making a dialogue box and enable crash data reporting.
+    // If data reporting is not enabled, QProcess will always return NormalExit.
+    _set_abort_behavior(_CALL_REPORTFAULT, _WRITE_ABORT_MSG | _CALL_REPORTFAULT);
+#endif
+    abort();
+}
+
 int main(int argc, char* argv[])
 {
     if (argc == 1)
     {
         // deliberately will crash if argument 1 missing
-        abort();
+        crash();
     }
     // Exit immediately if only 1 argument
     else if (argc == 2)
@@ -22,7 +32,7 @@ int main(int argc, char* argv[])
     // Crash on demand
     if (s == "crash")
     {
-        abort();
+        crash();
     }
 
     // Print out what was supplied by stdin

diff --git a/tests/test_basic_process.cpp b/tests/test_basic_process.cpp
@@ -38,7 +38,7 @@ TEST_F(BasicProcessTest, execute_missing_command)
     EXPECT_FALSE(process_state.completed_successfully());
     EXPECT_FALSE(process_state.exit_code);
 
-    EXPECT_TRUE(process_state.error);
+    ASSERT_TRUE(process_state.error);
     EXPECT_EQ(QProcess::ProcessError::FailedToStart, process_state.error->state);
 }
 
@@ -50,7 +50,7 @@ TEST_F(BasicProcessTest, execute_crashing_command)
     EXPECT_FALSE(process_state.completed_successfully());
     EXPECT_FALSE(process_state.exit_code);
 
-    EXPECT_TRUE(process_state.error);
+    ASSERT_TRUE(process_state.error);
     EXPECT_EQ(QProcess::ProcessError::Crashed, process_state.error->state);
 }
 
@@ -121,7 +121,7 @@ TEST_F(BasicProcessTest, process_state_when_runs_but_fails_to_stop)
     process_state = process.process_state();
     EXPECT_FALSE(process_state.exit_code);
 
-    EXPECT_TRUE(process_state.error);
+    ASSERT_TRUE(process_state.error);
     EXPECT_EQ(QProcess::Timedout, process_state.error->state);
 }
 
@@ -135,7 +135,7 @@ TEST_F(BasicProcessTest, process_state_when_crashes_on_start)
     auto process_state = process.process_state();
 
     EXPECT_FALSE(process_state.exit_code);
-    EXPECT_TRUE(process_state.error);
+    ASSERT_TRUE(process_state.error);
     EXPECT_EQ(QProcess::Crashed, process_state.error->state);
 }
 
@@ -151,7 +151,7 @@ TEST_F(BasicProcessTest, process_state_when_crashes_while_running)
 
     auto process_state = process.process_state();
     EXPECT_FALSE(process_state.exit_code);
-    EXPECT_TRUE(process_state.error);
+    ASSERT_TRUE(process_state.error);
     EXPECT_EQ(QProcess::Crashed, process_state.error->state);
 }
 
@@ -165,7 +165,7 @@ TEST_F(BasicProcessTest, process_state_when_failed_to_start)
     auto process_state = process.process_state();
 
     EXPECT_FALSE(process_state.exit_code);
-    EXPECT_TRUE(process_state.error);
+    ASSERT_TRUE(process_state.error);
     EXPECT_EQ(QProcess::FailedToStart, process_state.error->state);
 }