test: change storage folder for test logs

test/helper.py

@@ -31,7 +31,7 @@ failure-timeout: {self.failure_timeout}
         write_file(filename, self.to_yaml())
 
 def gen_batsim_cmd(platform, workload, output_dir, more_flags):
-    return f"batsim -p '{platform}' -w '{workload}' -e '{output_dir}' {more_flags}"
+    return f"batsim -p '{platform}' -w '{workload}' -e '{output_dir}/' {more_flags}"
 
 def write_file(filename, content):
     file = open(filename, "w")
@@ -55,9 +55,9 @@ def init_instance(test_name):
     return (output_dir, robin_filename, schedconf_filename)
 
 def has_expected_output(test_file):
-    return os.path.exists('test/expected_log/' + test_file + '_jobs.csv')
+    return os.path.exists('test/expected_log/' + test_file + '/_jobs.csv')
 
 def equals_expected_output(test_file):
     expected = 'test/expected_log/' + test_file + '_jobs.csv'
-    obtained = 'test-out/' +  test_file + '_jobs.csv'
+    obtained = 'test-out/' +  test_file + '/_jobs.csv'
     return filecmp.cmp(expected, obtained)
\ No newline at end of file

test/test_zexpected_output.py

@@ -3,5 +3,5 @@ from helper import *
 def test_expected_output():
     for log_file in os.listdir('test/expected_log'):
         expected = 'test/expected_log/' + log_file
-        obtained = 'test-out/' +  log_file
+        obtained = 'test-out/' +  log_file[:-9] + '/' + log_file[-9:]
         assert filecmp.cmp(expected, obtained)
\ No newline at end of file