Addressed @mgermain comments

Author: MarcCote

scripts/smart_worker.py

@@ -45,22 +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')
+                log_datetime = t.strftime("## SMART_DISPATCH - Started on: %Y-%m-%d %H:%M:%S ##\n")
+                if stdout_file.tell() > 0:  # Not the first line in the log file.
+                    log_datetime = t.strftime("\n## SMART_DISPATCH - Resumed on: %Y-%m-%d %H:%M:%S ##\n")
 
-                if stderr_already_exists:
-                    stderr_file.write('\n')
+                log_command = "## SMART_DISPATCH - Command: " + command + '\n'
 
-                stdout_file.write(t.strftime("## %Y-%m-%d %H:%M:%S ##\n"))
-                stdout_file.write("# " + command + '\n')
+                stdout_file.write(log_datetime + log_command)
                 stdout_file.flush()
-                stderr_file.write(t.strftime("## %Y-%m-%d %H:%M:%S ##\n"))
-                stderr_file.write("# " + command + '\n')
+                stderr_file.write(log_datetime + log_command)
                 stderr_file.flush()
 
                 error_code = subprocess.call(command, stdout=stdout_file, stderr=stderr_file, shell=True)

tests/test_smart_worker.py

@@ -45,14 +45,21 @@ def test_main(self):
                 executed_command = self.commands[self.commands_uid.index(uid)]
 
                 # Since the command was run twice.
-                for _ in range(2):
+                for i 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.
+
+                    if i == 0:
+                        assert_true("Started" in line)
+                    else:
+                        assert_true("Resumed" in line)
+
+                    assert_true(line.startswith("## SMART_DISPATCH"))
+                    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)
+                    assert_true(executed_command in line)
 
                     # Next should be the command's output
                     line = logfile.readline().strip()
@@ -73,14 +80,21 @@ def test_main(self):
                 executed_command = self.commands[self.commands_uid.index(uid)]
 
                 # Since the command was run twice.
-                for _ in range(2):
+                for i 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.
+
+                    if i == 0:
+                        assert_true("Started" in line)
+                    else:
+                        assert_true("Resumed" in line)
+
+                    assert_true(line.startswith("## SMART_DISPATCH"))
+                    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)
+                    assert_true(executed_command in line)
 
                     # Empty line
                     assert_equal(logfile.readline().strip(), "")