Restraint returns exit code 1 on watchdog timeout

[thrix]

restraint version: restraint-client-0.2.0-2.fc31eng.x86_64

In our CI we see:

....
[10.0.207.168        ] 1614485462 [Setup                                      ] PASS Score: 0
[10.0.207.168        ] 1614485463 [Test                                       ] PASS Score: 0
[10.0.207.168        ] 1614485464 [Cleanup                                    ] PASS Score: 0
[10.0.207.168        ] T:      23 [obs-with-multiple-files-don-t-complete-when] Completed: PASS
[10.0.207.168        ] T:      24 [460-cups-stack-buffer-overflow-in-libcups-s] Running
[10.0.207.168        ] 1614485468 [/10_localwatchdog                          ] WARN Score: 0
[10.0.207.168        ] 1614485469 [/99_reboot                                 ] WARN Score: 0

---^---^---^---^---^---
[05:17:29] [E] [J#0 RS#0] test execution failed: restraint command exited with return code 1: Recipe 1 exceeded lab watchdog timer [restraint-error-quark, 4]

But we would expect according to src/errors.h rather RESTRAINT_TASK_RUNNER_WATCHDOG_ERROR, i.e. exit code 4

[idorax]

The error message like:

Recipe 1 exceeded lab watchdog timer [restraint-error-quark, 4]

is from:

• https://github.com/restraint-harness/restraint/blob/master/src/client.c#L410

  403	gboolean
  404	watchdog_timeout_cb (gpointer user_data)
  405	{
  406	    RecipeData *recipe_data = (RecipeData*) user_data;
  407	    AppData *app_data = recipe_data->app_data;
  408	    if (! app_data->error) {
  409	        g_set_error (&app_data->error, RESTRAINT_ERROR,
  410	                     RESTRAINT_TASK_RUNNER_WATCHDOG_ERROR,
  411	                     "Recipe %d exceeded lab watchdog timer",
  412	                     recipe_data->recipe_id);
  413	    }
  414	    g_cancellable_cancel (recipe_data->cancellable);
  415	    return FALSE;
  416	}

And we can get the error code via app_data->error->code, but main() in src/client.c just returns like:

• https://github.com/restraint-harness/restraint/blob/master/src/client.c#L1966

  1957	    if (!success) {
  1958	        g_printerr ("%s [%s, %d]\n",
  1959	                    app_data->error->message,
  1960	                    g_quark_to_string (app_data->error->domain),
  1961	                    app_data->error->code);
  1962	    }
  1963	
  1964	    restraint_free_app_data (app_data);
  1965	
  1966	    return success ? EXIT_SUCCESS : EXIT_FAILURE;
  1967	}

But we would expect according to src/errors.h rather RESTRAINT_TASK_RUNNER_WATCHDOG_ERROR, i.e. exit code 4

Hi @thrix, the restraint command should exit with code RESTRAINT_TASK_RUNNER_WATCHDOG_ERROR instead of EXIT_FAILURE if it is on watchdog timeout, right?