Add timestamp to fireci logging headers. (#2790)

Author: yifanyang

ci/fireci/fireci/gradle.py

@@ -15,8 +15,6 @@
 import logging
 import os
 import subprocess
-import sys
-
 
 _logger = logging.getLogger('fireci.gradle')
 
@@ -39,9 +37,19 @@ def run(*args, gradle_opts='', workdir=None, check=True):
   command = ['./gradlew'] + list(args)
   _logger.info('Executing gradle command: "%s" in directory: "%s"',
                " ".join(command), workdir if workdir else '.')
-  return subprocess.run(
+
+  with subprocess.Popen(
       command,
       cwd=workdir,
       env=new_env,
-      check=check,
-  )
+      stdout=subprocess.PIPE,
+      stderr=subprocess.STDOUT,
+  ) as p:
+    for line in p.stdout:
+      _logger.info(line.decode().rstrip())
+
+    p.communicate()
+
+    if check and p.returncode:
+      raise subprocess.CalledProcessError(p.returncode, p.args, p.stdout, p.stderr)
+  return subprocess.CompletedProcess(p.args, p.returncode, p.stdout, p.stderr)

ci/fireci/fireci/main.py

@@ -19,7 +19,8 @@
 from .internal import main
 
 logging.basicConfig(
-    format='%(name)s: [%(levelname)s] %(message)s',
+    datefmt='%Y-%m-%d %H:%M:%S %z %Z',
+    format='[%(levelname).1s] %(asctime)s %(name)s: %(message)s',
     level=logging.INFO,
 )
 logging.getLogger('fireci').setLevel(logging.DEBUG)

ci/fireci/tests/gradle_test.py

@@ -28,13 +28,13 @@
 class GradleTest(unittest.TestCase):
 
   @in_tempdir
-  def test_when_gradle_suceeds_should_not_throw(self):
+  def test_when_gradle_succeeds_should_not_throw(self):
     create_artifacts(
         Artifact('gradlew', content=scripts.with_exit(0), mode=0o744))
     self.assertEqual(gradle.run('tasks').returncode, 0)
 
   @in_tempdir
-  def test_when_gradle_suceeds_should_not_throw(self):
+  def test_when_gradle_fails_should_throw(self):
     create_artifacts(
         Artifact('gradlew', content=scripts.with_exit(1), mode=0o744))
     self.assertRaises(subprocess.CalledProcessError,

ci/fireci/tests/integ_tests.py

@@ -12,9 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
 import pathlib
-import subprocess
 import unittest
 
 from click.testing import CliRunner
@@ -41,7 +39,7 @@ def test_gradle_invocation(self):
                 ['./gradlew'] + args,
                 {'GRADLE_OPTS': 'opts'},
                 ('sdk1/build/output/file1', 'content1'),
-                ('sdk1/build/outputss/file2', 'content2'),
+                ('sdk1/build/outputs/file2', 'content2'),
             ),
             mode=0o744))
     result = self.runner.invoke(cli, [
@@ -53,7 +51,7 @@ def test_gradle_invocation(self):
     artifacts = pathlib.Path('_artifacts')
     self.assertTrue(artifacts.exists())
 
-    output_file = artifacts / 'sdk1_build_outputss' / 'file2'
+    output_file = artifacts / 'sdk1_build_outputs' / 'file2'
     self.assertFalse(output_file.exists())
 
     output_file = artifacts / 'sdk1_build_output' / 'file1'