[TST] output and error logs produced by smart_worker.py.

Author: MarcCote

scripts/smart_worker.py

@@ -45,8 +45,17 @@ def main():
         stdout_filename = os.path.join(args.logs_dir, uid + ".out")
         stderr_filename = os.path.join(args.logs_dir, uid + ".err")
 
+        stdout_already_exists = os.path.isfile(stdout_filename)
+        stderr_already_exists = os.path.isfile(stderr_filename)
+
         with open(stdout_filename, 'a') as stdout_file:
             with open(stderr_filename, 'a') as stderr_file:
+                if stdout_already_exists:
+                    stdout_file.write('\n')
+
+                if stderr_already_exists:
+                    stderr_file.write('\n')
+
                 stdout_file.write(t.strftime("## %Y-%m-%d %H:%M:%S ##\n"))
                 stdout_file.write("# " + command + '\n')
                 stdout_file.flush()

tests/test_smart_worker.py

@@ -31,6 +31,9 @@ def tearDown(self):
     def test_main(self):
         command = ["smart_worker.py", self.command_manager._commands_filename, self.logs_dir]
         assert_equal(call(command), 0)
+        # Simulate a resume, i.e. re-run the command, the output/error should be concatenated.
+        self.command_manager.set_commands_to_run(self.commands)
+        assert_equal(call(command), 0)
 
         # Check output logs
         filenames = os.listdir(self.logs_dir)
@@ -41,13 +44,22 @@ def test_main(self):
                 uid = os.path.splitext(os.path.basename(log_filename))[0]
                 executed_command = self.commands[self.commands_uid.index(uid)]
 
-                # First line is the executed command in comment
-                header = logfile.readline().strip()
-                assert_equal(header, "# " + executed_command)
+                # Since the command was run twice.
+                for _ in range(2):
+                    # First line is the datetime of the executed command in comment.
+                    line = logfile.readline().strip()
+                    assert_true(time.strftime("## %Y-%m-%d %H:%M:") in line)  # Don't check seconds.
+
+                    # Second line is the executed command in comment.
+                    line = logfile.readline().strip()
+                    assert_equal(line, "# " + executed_command)
 
-                # Next should be the command's output
-                output = logfile.readline().strip()
-                assert_equal(output, executed_command[-1])  # We know those are 'echo' of a digit
+                    # Next should be the command's output
+                    line = logfile.readline().strip()
+                    assert_equal(line, executed_command[-1])  # We know those are 'echo' of a digit
+
+                    # Empty line
+                    assert_equal(logfile.readline().strip(), "")
 
                 # Log should be empty now
                 assert_equal("", logfile.read())
@@ -60,9 +72,18 @@ def test_main(self):
                 uid = os.path.splitext(os.path.basename(log_filename))[0]
                 executed_command = self.commands[self.commands_uid.index(uid)]
 
-                # First line is the executed command in comment
-                header = logfile.readline().strip()
-                assert_equal(header, "# " + executed_command)
+                # Since the command was run twice.
+                for _ in range(2):
+                    # First line is the datetime of the executed command in comment.
+                    line = logfile.readline().strip()
+                    assert_true(time.strftime("## %Y-%m-%d %H:%M:") in line)  # Don't check seconds.
+
+                    # Second line is the executed command in comment.
+                    line = logfile.readline().strip()
+                    assert_equal(line, "# " + executed_command)
+
+                    # Empty line
+                    assert_equal(logfile.readline().strip(), "")
 
                 # Log should be empty now
                 assert_equal("", logfile.read())