From 6ec45d21c2e70994a0a68d256e562f00fb37ccde Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 17 Jun 2022 14:16:03 +0100 Subject: [PATCH] Add patch to skip a test-case if /var/tmp doesn't support xattrs --- debian/patches/series | 1 + ...sert-that-extended-attributes-are-av.patch | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 debian/patches/test-basic-c-Don-t-assert-that-extended-attributes-are-av.patch diff --git a/debian/patches/series b/debian/patches/series index b73e566a..dd253aaf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ +test-basic-c-Don-t-assert-that-extended-attributes-are-av.patch debian/Skip-test-pull-repeated-during-CI.patch diff --git a/debian/patches/test-basic-c-Don-t-assert-that-extended-attributes-are-av.patch b/debian/patches/test-basic-c-Don-t-assert-that-extended-attributes-are-av.patch new file mode 100644 index 00000000..919597bd --- /dev/null +++ b/debian/patches/test-basic-c-Don-t-assert-that-extended-attributes-are-av.patch @@ -0,0 +1,37 @@ +From: Simon McVittie +Date: Fri, 17 Jun 2022 14:15:35 +0100 +Subject: test-basic-c: Don't assert that extended attributes are available + +Not all filesystems support extended attributes. This test uses +/var/tmp to try to get an extended-attributes-capable filesystem, +but that might not succeed. + +Signed-off-by: Simon McVittie +Forwarded: https://github.com/ostreedev/ostree/pull/2652 +--- + tests/test-basic-c.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/tests/test-basic-c.c b/tests/test-basic-c.c +index 1886feb..abaeca5 100644 +--- a/tests/test-basic-c.c ++++ b/tests/test-basic-c.c +@@ -514,8 +514,16 @@ test_read_xattrs (void) + g_assert_no_error (local_error); + + int r = fsetxattr (tmpd.fd, "user.ostreetesting", value, sizeof (value), 0); +- g_assert_cmpint (r, ==, 0); +- ++ ++ if (r != 0) ++ { ++ gchar *message = g_strdup_printf ("Unable to set extended attributes in /var/tmp: %s", ++ g_strerror (errno)); ++ ++ g_test_skip (message); ++ return; ++ } ++ + g_autoptr(GVariant) new_xattrs = ostree_fs_get_all_xattrs (tmpd.fd, NULL, error); + g_assert_no_error (local_error); +