[igt-dev] [PATCH i-g-t v2 12/16] tests/core_hotunplug: Fail subtests on device close errors

Janusz Krzysztofik
2020-08-07T09:19:58Z

Since health checks are now run from follow-up fixture sections, it is
safe to fail subtests without the need to abort the test execution. Do
that on device close errors instead of emitting warnings.

v2: Rebase on current upstream master.

Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
---
tests/core_hotunplug.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/core_hotunplug.c b/tests/core_hotunplug.c
index 313c44784..a4902eba2 100644
--- a/tests/core_hotunplug.c
+++ b/tests/core_hotunplug.c
@@ -126,8 +126,8 @@ static void device_unplug(struct hotunplug *priv, const char *prefix)
igt_reset_timeout();

priv->fd.sysfs_dev = local_close(priv->fd.sysfs_dev);
- igt_warn_on_f(priv->fd.sysfs_dev != -1,
- "Device sysfs node close failed\n");
+ igt_assert_f(priv->fd.sysfs_dev == -1,
+ "Device sysfs node close failed\n");
}

/* Re-discover the device by rescanning its bus */
@@ -249,7 +249,7 @@ static void hotunbind_lateclose(struct hotunplug *priv)

igt_debug("late closing the unbound device instance\n");
priv->fd.drm = local_close(priv->fd.drm);
- igt_warn_on_f(priv->fd.drm != -1, "Device close failed\n");
+ igt_assert_f(priv->fd.drm == -1, "Device close failed\n");
}

static void hotunplug_lateclose(struct hotunplug *priv)
@@ -266,7 +266,7 @@ static void hotunplug_lateclose(struct hotunplug *priv)

igt_debug("late closing the removed device instance\n");
priv->fd.drm = local_close(priv->fd.drm);
- igt_warn_on_f(priv->fd.drm != -1, "Device close failed\n");
+ igt_assert_f(priv->fd.drm == -1, "Device close failed\n");
}

/* Main */