Fix test failures: Create missing mount dir

Tests were failing because mount dir was missing.
Unclear to me why this became only recently an issue
(github internal - out of the sudden tests were hanging).

diff --git a/test/ci-build.sh b/test/ci-build.sh
index fe77bbdf857abebd2e3272cd9a774efdabbdff43..c41de7a50a1570ebdfd56c7d474400d6fe7804b5 100755 (executable)
--- a/test/ci-build.sh
+++ b/test/ci-build.sh
@@ -78,7 +78,7 @@ sanitized_build()
     # bug, cf. https://groups.google.com/forum/#!topic/mesonbuild/tgEdAXIIdC4
     meson configure -D b_lundef=false
 
-    meson configure
+    meson configure --no-pager
     ninja
     sudo ninja install
     sudo chmod 4755 ${PREFIX_DIR}/bin/fusermount3

diff --git a/test/test_ctests.py b/test/test_ctests.py
index 951a34b833c4846913237a39d8fa12da20de533d..c0afe3df48460f99f8fa395d60c260dc4bd6324f 100644 (file)
--- a/test/test_ctests.py
+++ b/test/test_ctests.py
@@ -9,10 +9,11 @@ import subprocess
 import pytest
 import platform
 import sys
+import os
 from looseversion import LooseVersion
 from util import (wait_for_mount, umount, cleanup, base_cmdline,
                   safe_sleep, basename, fuse_test_marker, fuse_caps,
-                  fuse_proto)
+                  fuse_proto, create_tmpdir)
 from os.path import join as pjoin
 import os.path
 
@@ -29,6 +30,9 @@ def test_write_cache(tmpdir, writeback, output_checker):
     # deadlock in valgrind, it probably assumes that until close() returns,
     # control does not come to the program.
     mnt_dir = str(tmpdir)
+    print("mnt_dir: '" + mnt_dir + "'")
+    create_tmpdir(mnt_dir)
+
     cmdline = [ pjoin(basename, 'test', 'test_write_cache'),
                 mnt_dir ]
     if writeback:
@@ -50,6 +54,7 @@ if fuse_proto >= (7,15):
 @pytest.mark.parametrize("notify", (True, False))
 def test_notify1(tmpdir, name, notify, output_checker):
     mnt_dir = str(tmpdir)
+    create_tmpdir(mnt_dir)
     cmdline = base_cmdline + \
               [ pjoin(basename, 'example', name),
                 '-f', '--update-interval=1', mnt_dir ]
@@ -80,6 +85,7 @@ def test_notify1(tmpdir, name, notify, output_checker):
 @pytest.mark.parametrize("notify", (True, False))
 def test_notify_file_size(tmpdir, notify, output_checker):
     mnt_dir = str(tmpdir)
+    create_tmpdir(mnt_dir)
     cmdline = base_cmdline + \
               [ pjoin(basename, 'example', 'invalidate_path'),
                 '-f', '--update-interval=1', mnt_dir ]

diff --git a/test/util.py b/test/util.py
index 0a1fa93cdf27b9ab4d14d3f87fb5944eb72afa94..623b031f461db6f647739b26c41814b434c7c46d 100644 (file)
--- a/test/util.py
+++ b/test/util.py
@@ -151,6 +151,12 @@ def powerset(iterable):
   return itertools.chain.from_iterable(
       itertools.combinations(s, r) for r in range(len(s)+1))
 
+def create_tmpdir(mnt_dir):
+    if not os.path.exists(mnt_dir):
+        print("makedirs: '" + mnt_dir + "'")
+        os.makedirs(mnt_dir)
+    else:
+        print("mnt_dir exists: '" + mnt_dir + "'")
 
 # Use valgrind if requested
 if os.environ.get('TEST_WITH_VALGRIND', 'no').lower().strip() \