commit bc7b61225c09625ee6b2f6b30dda952f32977125
author Jim Tang <jimtang@google.com> Mon Jan 06 14:23:29 2020 +0800
committer Jim Tang <jimtang@google.com> Mon Jan 06 15:46:00 2020 +0800
tree ee1a24a0dfca3c0238affecc5fb4a3ec32bf7b13
parent 05b3080fa665becb0a68695981593f31a3d10a8b

Atest: fix NoneType of atest_unittest.py.

Running unit tests will seldom encounter flaky test failure:
  self.assertTrue(data_time)
  AssertionError: None is not true
tempfile.mkdkdtemp() generates hashed filename which contains "_" so the
previous parsing would be faulty when the string is YYYYMMDD_HHMM__<hash>

Bug: 147202893

Test: source build/envsetup.sh; lunch
  croot tools/tradefederation/core/atest
  ./run_atest_unittests.sh
  ./atest_run_unittests.py

Change-Id: I02d15d79765d94882b67f86b0c733a02ae357284

atest/atest_unittest.py

diff --git a/atest/atest_unittest.py b/atest/atest_unittest.py
index 5600d75..84f640c 100755
--- a/atest/atest_unittest.py
+++ b/atest/atest_unittest.py
@@ -283,17 +283,15 @@
         """Test make_test_run_dir."""
         tmp_dir = tempfile.mkdtemp()
         constants.ATEST_RESULT_ROOT = tmp_dir
-        data_time = None
-        try:
-            word_dir = atest.make_test_run_dir()
-            folder_name = os.path.basename(word_dir)
-            data_time = datetime.datetime.strptime('_'.join(folder_name.split('_')[:-1]),
-                                                   atest.TEST_RUN_DIR_PREFIX)
-        except ValueError:
-            pass
-        finally:
-            reload(constants)
-        self.assertTrue(data_time)
+        date_time = None
+
+        work_dir = atest.make_test_run_dir()
+        folder_name = os.path.basename(work_dir)
+        date_time = datetime.datetime.strptime('_'.join(folder_name.split('_')[0:2]),
+                                               atest.TEST_RUN_DIR_PREFIX)
+
+        reload(constants)
+        self.assertIsNotNone(date_time)
 
 
 if __name__ == '__main__':