Always write the datetime and the command in output logs.

Author: MarcCote

scripts/smart_worker.py

@@ -45,22 +45,13 @@ 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(t.strftime("## %Y-%m-%d %H:%M:%S ##\n"))
-                else:
-                    stdout_file.write("# " + command + '\n')
-
-                if stderr_already_exists:
-                    stderr_file.write(t.strftime("## %Y-%m-%d %H:%M:%S ##\n"))
-                else:
-                    stderr_file.write("# " + command + '\n')
-
+                stdout_file.write(t.strftime("## %Y-%m-%d %H:%M:%S ##\n"))
+                stdout_file.write("# " + command + '\n')
                 stdout_file.flush()
+                stderr_file.write(t.strftime("## %Y-%m-%d %H:%M:%S ##\n"))
+                stderr_file.write("# " + command + '\n')
                 stderr_file.flush()
 
                 error_code = subprocess.call(command, stdout=stdout_file, stderr=stderr_file, shell=True)

smartdispatch/tests/test_smartdispatch.py

@@ -223,4 +223,4 @@ def test_log_command_line():
     assert_true(t.strftime("## %Y-%m-%d %H:%M:") in lines[6])  # Don't check second.
     assert_equal(lines[7], re.sub(r'(\[)([^\[\]]*\\ [^\[\]]*)(\])', r'"\1\2\3"', command_3))
 
-    shutil.rmtree(temp_dir)
+    shutil.rmtree(temp_dir)

tests/test_smart_dispatch.py

@@ -60,12 +60,12 @@ def test_main_resume(self):
         assert_equal(len(open(running_commands_file).readlines()), 0)
         assert_equal(len(open(pending_commands_file).readlines()), len(commands))
 
-		# Test when batch_uid is a path instead of a jobname.
-		# Setup
+        # Test when batch_uid is a path instead of a jobname.
+        # Setup
         call(self.launch_command, shell=True)
         batch_uid = os.path.join(self.logs_dir, os.listdir(self.logs_dir)[0])
 
-		# Simulate that some commands are in the running state.
+        # Simulate that some commands are in the running state.
         path_job_commands = os.path.join(self.logs_dir, batch_uid, "commands")
         pending_commands_file = pjoin(path_job_commands, "commands.txt")
         running_commands_file = pjoin(path_job_commands, "running_commands.txt")
@@ -85,7 +85,6 @@ def test_main_resume(self):
         assert_equal(len(open(running_commands_file).readlines()), 0)
         assert_equal(len(open(pending_commands_file).readlines()), len(commands))
 
-
     def test_main_resume_only_pending(self):
         # SetUp
         call(self.launch_command, shell=True)