Commit ce130a07 authored by Arkadiusz Hiler's avatar Arkadiusz Hiler

tests/kms_chamelium: Wait for chamelium being reachable after a suspend

Getting network back after waking up from suspend takes some time.
If it's not quick enough, it may cause any following chamelium_rpc
to fail.

This includes the chamelium port reset in exit handler:

	igt_chamelium-CRITICAL: Test assertion failure function chamelium_rpc,
				file ../lib/igt_chamelium.c:349:
	igt_chamelium-CRITICAL: Failed assertion: !chamelium->env.fault_occurred
	igt_chamelium-CRITICAL: Last errno: 113, No route to host
	igt_chamelium-CRITICAL: Chamelium RPC call failed: libcurl failed to execute
				the HTTP POST transaction, explaining:
				Failed to connect to 192.168.1.224 port 9992: No route to host

	Stack trace:
	  #0 ../lib/igt_core.c:1674 __igt_fail_assert()
	  #1 [chamelium_rpc+0x1ea]
	  #2 ../lib/igt_chamelium.c:2274 chamelium_reset()
	  #3 ../lib/igt_chamelium.c:2361 chamelium_deinit()
	  #4 ../lib/igt_core.c:2124 call_exit_handlers()

So let's wait for Chamelium to be reachable after each suspend_autoresume.

v2: Bump the network timeout to 20s,
    the slowest observed bring-up was 17s. (Petri)
    Do not DECREF if we get NULL from __chmelium_rpc(). (Simon & CI)

Cc: Simon Ser <simon.ser@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109380Signed-off-by: Arkadiusz Hiler's avatarArkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Simon Ser's avatarSimon Ser <simon.ser@intel.com>
parent ffa792ea
Pipeline #57357 passed with stages
in 2 minutes and 20 seconds
......@@ -351,6 +351,32 @@ static xmlrpc_value *chamelium_rpc(struct chamelium *chamelium,
return res;
}
static bool __chamelium_is_reachable(struct chamelium *chamelium)
{
xmlrpc_value *res;
/* GetSupportedInputs does not require a port and is harmless */
res = __chamelium_rpc(chamelium, NULL, "GetSupportedInputs", "()");
if (res != NULL)
xmlrpc_DECREF(res);
if (chamelium->env.fault_occurred)
igt_debug("Chamelium RPC call failed: %s\n",
chamelium->env.fault_string);
return !chamelium->env.fault_occurred;
}
void chamelium_wait_reachable(struct chamelium *chamelium, int timeout)
{
bool chamelium_online = igt_wait(__chamelium_is_reachable(chamelium),
timeout * 1000, 100);
igt_assert_f(chamelium_online,
"Couldn't connect to Chamelium for %ds", timeout);
}
/**
* chamelium_plug:
* @chamelium: The Chamelium instance to use
......
......@@ -112,6 +112,7 @@ drmModeConnector *chamelium_port_get_connector(struct chamelium *chamelium,
bool reprobe);
const char *chamelium_port_get_name(struct chamelium_port *port);
void chamelium_wait_reachable(struct chamelium *chamelium, int timeout);
void chamelium_plug(struct chamelium *chamelium, struct chamelium_port *port);
void chamelium_unplug(struct chamelium *chamelium, struct chamelium_port *port);
bool chamelium_is_plugged(struct chamelium *chamelium,
......
......@@ -57,6 +57,7 @@ typedef struct {
} data_t;
#define HOTPLUG_TIMEOUT 20 /* seconds */
#define ONLINE_TIMEOUT 20 /* seconds */
#define HPD_STORM_PULSE_INTERVAL_DP 100 /* ms */
#define HPD_STORM_PULSE_INTERVAL_HDMI 200 /* ms */
......@@ -369,6 +370,7 @@ try_suspend_resume_hpd(data_t *data, struct chamelium_port *port,
igt_system_suspend_autoresume(state, test);
igt_assert(wait_for_hotplug(mon, &timeout));
chamelium_wait_reachable(data->chamelium, ONLINE_TIMEOUT);
if (port) {
igt_assert_eq(reprobe_connector(data, port), target_state);
......@@ -474,8 +476,8 @@ test_suspend_resume_edid_change(data_t *data, struct chamelium_port *port,
igt_flush_hotplugs(mon);
igt_system_suspend_autoresume(state, test);
igt_assert(igt_hotplug_detected(mon, HOTPLUG_TIMEOUT));
chamelium_wait_reachable(data->chamelium, ONLINE_TIMEOUT);
get_connectors_link_status_failed(data, link_status_failed[1]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment