Test hook: ECCE_TEST_DIALOG_ANSWER picks the button; launcher test covers Launch anyway

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BTQ7mniRtDdhU7VF9tEVBD

Author: andy

src/wxgui/wxdialogs/ewxMessageDialog.C

@@ -1,3 +1,4 @@
+#include <cstring>
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
@@ -122,6 +123,7 @@ void ewxMessageDialog::OnButtonClick( wxCommandEvent& event )
 
 // ECCE_TEST_DIALOG_CLOSE=<seconds>: log the dialog to stderr, then dismiss it
 // after that long, so a headless run can see it and still end cleanly.
+// ECCE_TEST_DIALOG_ANSWER=yes|ok|cancel picks the button pressed (default ok).
 int ewxMessageDialog::ShowModal()
 {
   const char * secs = getenv("ECCE_TEST_DIALOG_CLOSE");
@@ -132,7 +134,11 @@ int ewxMessageDialog::ShowModal()
           (const char *)p_label->GetLabel().mb_str());
   fflush(stderr);
   wxTimer timer(this);
-  Bind(wxEVT_TIMER, [this](wxTimerEvent&) { EndModal(wxID_OK); });
+  const char * ans = getenv("ECCE_TEST_DIALOG_ANSWER");
+  int id = wxID_OK;
+  if (ans && !strcmp(ans, "yes")) id = wxID_YES;
+  else if (ans && !strcmp(ans, "cancel")) id = wxID_CANCEL;
+  Bind(wxEVT_TIMER, [this, id](wxTimerEvent&) { EndModal(id); });
   timer.StartOnce(atoi(secs) * 1000);
   return ewxDialog::ShowModal();
 }

tests/machregister/launcher_test.py

@@ -74,10 +74,12 @@ def mpi_check(disp, build, tmp):
     g.write(os.path.join(fake, "mpirun"), "#!/bin/sh\n")
     os.chmod(os.path.join(fake, "mpirun"), 0o755)
 
-    def run(path, script):
+    def run(path, script, answer=None):
         g.write(os.path.join(e.root, "lscript"), script)
         env = e.env(disp)
         env.pop("ECCE_MACHREG_SCRIPT", None)
+        if answer:
+            env["ECCE_TEST_DIALOG_ANSWER"] = answer
         env.update({"ECCE_REALUSER": "eccetest", "PATH": path,
                     "ECCE_TEST_DIALOG_CLOSE": "1",
                     "ECCE_LAUNCHER_SCRIPT": os.path.join(e.root, "lscript")})
@@ -107,6 +109,16 @@ def run(path, script):
             "a missing mpirun for ORCA on 4 cores is named")
     g.check("mpicheck NWChem: go" in out,
             "after Run on 1 core nothing more is asked")
+    p = run(farm, """
+machine localhost
+procs 4
+mpicheck ORCA
+expect wsprocs 4
+quit
+""", answer="yes")
+    clean(p, "the MPI check answered Launch anyway")
+    g.check("ECCE_TEST_DIALOG:" in p.stdout and "mpicheck ORCA: go" in p.stdout,
+            "Launch anyway goes on with the cores as set (4)")
     p = run(fake + os.pathsep + farm, """
 machine localhost
 procs 4