fixed tests

Author: bugy

src/tests/execution_service_test.py

@@ -1,4 +1,5 @@
 import copy
+import time
 import unittest
 
 from parameterized import parameterized
@@ -248,6 +249,9 @@ def test_start_finish_listener_order(self):
 
         self._start(execution_service)
 
+        if len(notifications) < 2:
+            time.sleep(0.01)
+
         self.assertEqual(['started', 'finished'], notifications)
 
     def _start(self, execution_service, user_id=DEFAULT_USER_ID):

src/tests/external_model_test.py

@@ -174,15 +174,22 @@ def test_config_with_none_values(self):
 class TestParseExternalSchedule(unittest.TestCase):
     def test_parse_full_config(self):
         parsed = parse_external_schedule(
-            {'repeatable': False, 'startDatetime': '2020-12-30', 'repeatUnit': 'days', 'repeatPeriod': 5,
-             'weekDays': ['monday', 'Tuesday']})
+            {'repeatable': False,
+             'startDatetime': '2020-12-30',
+             'repeatUnit': 'days',
+             'repeatPeriod': 5,
+             'weekDays': ['monday', 'Tuesday'],
+             'endOption': 'max_executions',
+             'endArg': 3})
 
         self.assertDictEqual({
             'repeatable': False,
             'start_datetime': '2020-12-30',
             'repeat_unit': 'days',
             'repeat_period': 5,
-            'weekdays': ['monday', 'Tuesday']},
+            'weekdays': ['monday', 'Tuesday'],
+            'end_option': 'max_executions',
+            'end_arg': 3},
             parsed)
 
     def test_parse_partial_config(self):
@@ -194,7 +201,9 @@ def test_parse_partial_config(self):
             'start_datetime': '2020-12-30',
             'repeat_unit': None,
             'repeat_period': None,
-            'weekdays': None},
+            'weekdays': None,
+            'end_arg': None,
+            'end_option': None},
             parsed)
 
     def test_parse_unknown_field(self):
@@ -208,4 +217,6 @@ def test_parse_unknown_field(self):
             'start_datetime': '2020-12-30',
             'repeat_unit': None,
             'repeat_period': None,
-            'weekdays': None}, parsed)
+            'weekdays': None,
+            'end_arg': None,
+            'end_option': None}, parsed)

src/tests/scheduling/schedule_service_test.py

@@ -431,7 +431,8 @@ def create_job(id=None,
                repeat_unit=None,
                repeat_period=None,
                weekdays=None,
-               parameter_values=None):
+               parameter_values=None,
+               executions_count=0):
     if audit_names is None:
         audit_names = {audit_utils.HOSTNAME: 'my-host'}
 
@@ -450,6 +451,7 @@ def create_job(id=None,
     schedule_config.repeat_unit = repeat_unit
     schedule_config.repeat_period = repeat_period
     schedule_config.weekdays = weekdays
+    schedule_config.executions_count = executions_count
 
     return SchedulingJob(id, User(user_id, audit_names), schedule_config, script_name, parameter_values)