Fix Bug When Reading Directories (#203)

LLNL · Sep 6, 2024 · e956f5a · e956f5a
1 parent 29197ea
commit e956f5a
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/thicket/tests/test_reader_dispatch.py b/thicket/tests/test_reader_dispatch.py
@@ -30,7 +30,7 @@ def test_empty_iterable():
 
 
 def test_file_not_found():
-    with pytest.raises(FileNotFoundError, match="File 'blah' not found"):
+    with pytest.raises(ValueError, match="Path 'blah' not found"):
         Thicket.reader_dispatch(
             GraphFrame.from_caliperreader,
             False,
@@ -58,3 +58,33 @@ def test_valid_type():
             True,
             -1,
         )
+
+
+def test_valid_inputs(rajaperf_cali_1trial, data_dir):
+
+    # Works with list
+    Thicket.reader_dispatch(
+        GraphFrame.from_caliperreader,
+        False,
+        True,
+        True,
+        rajaperf_cali_1trial,
+    )
+
+    # Works with single file
+    Thicket.reader_dispatch(
+        GraphFrame.from_caliperreader,
+        False,
+        True,
+        True,
+        rajaperf_cali_1trial[0],
+    )
+
+    # Works with directory
+    Thicket.reader_dispatch(
+        GraphFrame.from_caliperreader,
+        False,
+        True,
+        True,
+        f"{data_dir}/rajaperf/lassen/clang10.0.1_nvcc10.2.89_1048576/1/",
+    )
diff --git a/thicket/thicket.py b/thicket/thicket.py
@@ -362,8 +362,8 @@ def reader_dispatch(
                 if not os.path.isfile(file):
                     raise FileNotFoundError("File '" + file + "' not found")
         elif isinstance(obj, str):
-            if not os.path.isfile(obj):
-                raise FileNotFoundError("File '" + obj + "' not found")
+            if not os.path.exists(obj):
+                raise ValueError("Path '" + obj + "' not found")
         else:
             raise TypeError(
                 "'" + str(type(obj).__name__) + "' is not a valid type to be read from"