X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=test%2Fintegration%2Ftestlib%2Fcheck.py;h=0f3b414b0f4fa972718231c594ce5ab2e4f3f1a1;hb=c6a15e27d934e90a1f3a26438dddb395bdc9de19;hp=a82e0e439bcaf9473322f5d80b0b65d79e6fc7b4;hpb=7bc1936eded0367aab1a4b9a393ccfd74ab110f7;p=tinc

diff --git a/test/integration/testlib/check.py b/test/integration/testlib/check.py
index a82e0e43..0f3b414b 100755
--- a/test/integration/testlib/check.py
+++ b/test/integration/testlib/check.py
@@ -10,6 +10,12 @@ Val = T.TypeVar("Val")
 Num = T.TypeVar("Num", int, float)
 
 
+def blank(value: T.AnyStr) -> None:
+    """Check that value is an empty or blank string."""
+    if not isinstance(value, str) or value.strip():
+        raise ValueError(f'expected "{value!r}" to be a blank string')
+
+
 def false(value: T.Any) -> None:
     """Check that value is falsy."""
     if value:
@@ -98,6 +104,12 @@ def files_eq(path0: str, path1: str) -> None:
 
 
 def file_exists(path: T.Union[str, Path]) -> None:
-    """Check that file or directory exists."""
-    if not os.path.exists(path):
-        raise ValueError("expected path '{path}' to exist")
+    """Check that file exists."""
+    if not os.path.isfile(path):
+        raise ValueError(f"expected file '{path}' to exist")
+
+
+def dir_exists(path: T.Union[str, Path]) -> None:
+    """Check that directory exists."""
+    if not os.path.isdir(path):
+        raise ValueError(f"expected directory '{path}' to exist")