From 373bdb08d7503deb13351a3e02bfdaaf7fbb36a4 Mon Sep 17 00:00:00 2001
From: Mathieu Bultel <mat.bultel@gmail.com>
Date: Wed, 10 Jun 2020 15:43:32 +0200
Subject: [PATCH] Catch value error when extract log info from log name

We need to catch ValueError when we extract log information
from the file name provided by user.
Instead of raising an exception, we just log a warning to the
user. The normal usage can handle None uuid or timestamp or
validation-id.
This will aim to make the ValidationLog class more generic.

Change-Id: Iccc2a37b4c2c911e634a210de253ba1111e5b7e7
---
 validations_libs/tests/test_validation_log.py | 19 +++++++++++++++++++
 validations_libs/validation_logs.py           |  9 +++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/validations_libs/tests/test_validation_log.py b/validations_libs/tests/test_validation_log.py
index f1455438..54b3e022 100644
--- a/validations_libs/tests/test_validation_log.py
+++ b/validations_libs/tests/test_validation_log.py
@@ -37,6 +37,25 @@ class TestValidationLog(TestCase):
         self.assertEquals(val.validation_id, 'foo')
         self.assertEquals(val.datetime, '2020-03-30T13:17:22.447857Z')
 
+    @mock.patch('json.load')
+    @mock.patch('six.moves.builtins.open')
+    def test_validation_underscore_validation_id(self, mock_open, mock_json):
+        val = ValidationLog(
+            logfile='/tmp/123_foo_bar_2020-03-30T13:17:22.447857Z.json')
+        self.assertEquals(val.uuid, '123')
+        self.assertEquals(val.validation_id, 'foo_bar')
+        self.assertEquals(val.datetime, '2020-03-30T13:17:22.447857Z')
+
+    @mock.patch('json.load')
+    @mock.patch('six.moves.builtins.open')
+    def test_validation_wrong_log_file(self, mock_open, mock_json):
+        msg = ('Wrong log file format, it should be formed '
+               'such as {uuid}_{validation-id}_{timestamp}')
+        with mock.patch('logging.Logger.warning') as mock_log:
+            ValidationLog(
+                logfile='/tmp/foo_2020-03-30T13:17:22.447857Z.json')
+            mock_log.assert_called_with(msg)
+
     @mock.patch('glob.glob')
     @mock.patch('json.load',
                 return_value=fakes.VALIDATIONS_LOGS_CONTENTS_LIST[0])
diff --git a/validations_libs/validation_logs.py b/validations_libs/validation_logs.py
index 1393ea10..d41bf378 100644
--- a/validations_libs/validation_logs.py
+++ b/validations_libs/validation_logs.py
@@ -41,9 +41,14 @@ class ValidationLog(object):
             full_path = self.get_log_path()
         self.content = self._get_content(full_path)
         self.name = os.path.splitext(os.path.basename(full_path))[0]
+        # if we have a log file then extract uuid, validation_id and timestamp
         if logfile:
-            self.uuid, self.validation_id, self.datetime = \
-                self.name.replace('.{}'.format(self.extension), '').split('_')
+            try:
+                self.uuid, _name = self.name.split('_', 1)
+                self.validation_id, self.datetime = _name.rsplit('_', 1)
+            except ValueError:
+                logging.warning('Wrong log file format, it should be formed '
+                                'such as {uuid}_{validation-id}_{timestamp}')
 
     def _get_content(self, file):
         try: