Fix cli and inclusion file tests (#104)

Author: stefanv

tests/test_cli.py

@@ -1,5 +1,4 @@
 import os
-import sys
 
 import pytest
 
@@ -9,24 +8,16 @@
 example_calendar = os.path.join(basedir, "../example/test_calendar.yaml")
 
 
-def test_cli(monkeypatch):
-    with monkeypatch.context() as m:
-        m.setattr(sys, "argv", ["yaml2ics.py", example_calendar])
-        main()
+def test_cli():
+    main(["yaml2ics.py", example_calendar])
 
-    with monkeypatch.context() as m:
-        m.setattr(sys, "argv", ["yaml2ics.py"])
-
-        with pytest.raises(RuntimeError) as e:
-            main()
-            assert "Usage:" in str(e)
-
-    with monkeypatch.context() as m:
-        m.setattr(sys, "argv", ["yaml2ics.py", "syzygy.yaml"])
+    with pytest.raises(RuntimeError) as e:
+        main(["yaml2ics.py"])
+        assert "Usage:" in str(e)
 
-        with pytest.raises(RuntimeError) as e:
-            main()
-            assert "is not a file" in str(e)
+    with pytest.raises(RuntimeError) as e:
+        main(["yaml2ics.py", "syzygy.yaml"])
+        assert "is not a file" in str(e)
 
 
 def test_errors():

tests/test_include.py

@@ -1,10 +1,12 @@
 import io
+import os
 import textwrap
 
 from yaml2ics import files_to_calendar
 
 
 def _read(f, mode=None):
+    f = os.path.relpath(f)  # Changes ./a.yaml to a.yaml
     if f == "a.yaml":
         return io.StringIO(
             textwrap.dedent(
@@ -31,7 +33,7 @@ def _read(f, mode=None):
             """
             )
         )
-    else:
+    elif f in ("c.yaml", "d.yaml"):
         # Return template with summary of the letters
         return io.StringIO(
             textwrap.dedent(
@@ -43,11 +45,16 @@ def _read(f, mode=None):
                 % (f[0].upper() * 5)
             )
         )
+    else:
+        raise RuntimeError("Attempting to load invalid test file")
 
 
 def test_include_calendars(monkeypatch):
     """Calendar that includes other calendars"""
     monkeypatch.setitem(__builtins__, "open", _read)
+    monkeypatch.setattr(os.path, "dirname", lambda _: ".")
+    test_files = ["a.yaml", "b.yaml", "c.yaml", "d.yaml"]
+    monkeypatch.setattr(os.path, "exists", lambda f: os.path.relpath(f) in test_files)
     cal = files_to_calendar(["a.yaml"])
     cal_str = cal.serialize()
     assert cal_str.startswith("BEGIN:VCALENDAR")

yaml2ics.py

@@ -164,7 +164,10 @@ def files_to_events(files: list) -> (ics.Calendar, str):
         if hasattr(f, "read"):
             calendar_yaml = yaml.load(f.read(), Loader=yaml.FullLoader)
         else:
-            calendar_yaml = yaml.load(open(f), Loader=yaml.FullLoader)
+            if not os.path.exists(f):
+                raise RuntimeError(f"Cannot find included yaml file `{f}`.")
+            with open(f, "rb") as fh:
+                calendar_yaml = yaml.load(fh, Loader=yaml.FullLoader)
         tz = calendar_yaml.get("timezone", None)
         if tz is not None:
             tz = gettz(tz)
@@ -198,11 +201,11 @@ def files_to_calendar(files: list) -> ics.Calendar:
 # `main` is separate from `cli` to facilitate testing.
 # The only difference being that `main` raises errors while
 # `cli` prints them and exits with errorcode 1
-def main():
-    if len(sys.argv) < 2:
+def main(argv: list):
+    if len(argv) < 2:
         raise RuntimeError("Usage: yaml2ics.py FILE1.yaml FILE2.yaml ...")
 
-    files = sys.argv[1:]
+    files = argv[1:]
     for f in files:
         if not os.path.isfile(f):
             raise RuntimeError(f"Error: {f} is not a file")
@@ -214,7 +217,7 @@ def main():
 
 def cli():
     try:
-        main()
+        main(sys.argv)
     except Exception as e:
         print(e, file=sys.stderr)
         sys.exit(-1)