From 4df5d391b3b02b1e2d65d46ed5c7391995f21991 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Wed, 4 Aug 2021 17:14:41 +0100
Subject: [PATCH] tests: Assert that ${ORIGIN}, ${FUTURE} are handled correctly

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 tests/pressure-vessel/wrap-setup.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/tests/pressure-vessel/wrap-setup.c b/tests/pressure-vessel/wrap-setup.c
index daf82aec1..c7b75de32 100644
--- a/tests/pressure-vessel/wrap-setup.c
+++ b/tests/pressure-vessel/wrap-setup.c
@@ -418,14 +418,11 @@ test_remap_ld_preload (Fixture *f,
   /* We don't know what ${ORIGIN} will expand to, so we have to cut off at
    * /overlay/libs */
   g_assert_false (flatpak_exports_path_is_visible (exports, "/overlay"));
-
-  if (!flatpak_exports_path_is_visible (exports, "/overlay/libs"))
-    g_test_message ("TODO: Export /overlay/libs");
+  g_assert_true (flatpak_exports_path_is_visible (exports, "/overlay/libs"));
 
   /* We don't know what ${FUTURE} will expand to, so we have to cut off at
    * /future */
-  if (!flatpak_exports_path_is_visible (exports, "/future"))
-    g_test_message ("TODO: Export /future");
+  g_assert_true (flatpak_exports_path_is_visible (exports, "/future"));
 
   /* We don't export the entire root directory just because it has a
    * module in it */
@@ -659,14 +656,11 @@ test_remap_ld_preload_no_runtime (Fixture *f,
   /* We don't know what ${ORIGIN} will expand to, so we have to cut off at
    * /overlay/libs */
   g_assert_false (flatpak_exports_path_is_visible (exports, "/overlay"));
-
-  if (!flatpak_exports_path_is_visible (exports, "/overlay/libs"))
-    g_test_message ("TODO: Export /overlay/libs");
+  g_assert_true (flatpak_exports_path_is_visible (exports, "/overlay/libs"));
 
   /* We don't know what ${FUTURE} will expand to, so we have to cut off at
    * /future */
-  if (!flatpak_exports_path_is_visible (exports, "/future"))
-    g_test_message ("TODO: Export /future");
+  g_assert_true (flatpak_exports_path_is_visible (exports, "/future"));
 
   /* We don't export the entire root directory just because it has a
    * module in it */
-- 
GitLab