From 23f6aadb4242cb29608a44b802f2fb3309cb6100 Mon Sep 17 00:00:00 2001
From: Tue Herlau <tuhe@dtu.dk>
Date: Thu, 13 Jul 2023 14:52:58 +0200
Subject: [PATCH] Fixed test suite
---
tests/_trial_temp/_trial_marker | 0
tests/setup_test_files.py | 2 +-
tests/test_python.py | 15 +++++++++------
3 files changed, 10 insertions(+), 7 deletions(-)
create mode 100755 tests/_trial_temp/_trial_marker
diff --git a/tests/_trial_temp/_trial_marker b/tests/_trial_temp/_trial_marker
new file mode 100755
index 0000000..e69de29
diff --git a/tests/setup_test_files.py b/tests/setup_test_files.py
index d0a1fa1..4181e12 100644
--- a/tests/setup_test_files.py
+++ b/tests/setup_test_files.py
@@ -25,7 +25,7 @@ def setup_keep(source, dest):
if __name__ == "__main__":
print("File used for setting up sets -- don't run this script unless repository known to work (Tue, 2022)")
- assert False
+ # assert False
# if os.path.isdir("student_repo"):
# shutil.rmtree("student_repo")
diff --git a/tests/test_python.py b/tests/test_python.py
index 17f8e90..80f0386 100644
--- a/tests/test_python.py
+++ b/tests/test_python.py
@@ -30,21 +30,24 @@ def is_same(dir1, dir2):
return False
return True
+
+dir = os.path.dirname(__file__)
+
class TestPython(TestCase):
def test_demo1(self):
from setup_test_files import setup, setup_keep
- setup("demo1", "demo1_tmp")
- report = filecmp.dircmp("demo1_correct", "demo1_tmp")
+ setup(dir+"/demo1", dir+"/demo1_tmp")
+ report = filecmp.dircmp(dir+"/demo1_correct", dir+"/demo1_tmp")
print("Different", report.report())
- self.assertTrue(is_same("demo1_correct", "demo1_tmp"))
+ self.assertTrue(is_same(dir+"/demo1_correct", dir+"/demo1_tmp"))
def test_demo2(self):
from setup_test_files import setup, setup_keep
- setup_keep("demo2/framework.py", "demo2/framework_tmp.txt")
- with open("demo2/framework_tmp.txt") as f:
+ setup_keep(dir+"/demo2/framework.py", dir+"/demo2/framework_tmp.txt")
+ with open(dir+"/demo2/framework_tmp.txt") as f:
tmp = f.read()
- with open("demo2/framework_correct.txt") as f:
+ with open(dir+"/demo2/framework_correct.txt") as f:
correct = f.read()
self.assertEqual(tmp, correct)
--
GitLab