From fdfb65a8ffd2fb0a539a880961e2daa197be7dc7 Mon Sep 17 00:00:00 2001 From: Renat Akhmerov Date: Mon, 9 Sep 2019 14:31:51 +0700 Subject: [PATCH] Fix workflow language tests after updating jsonschema to 3.0.2 * The new version of jsonschema (3.0.2) considers numbers written as XXX.0 (an integer but written using the form of float numbers) integers. Whereas the previous versions didn't. So we have to fix the tests that expected an error in this case when validating the syntax of the policies. Change-Id: Ifc36f4a1f6126d6cbde2424fd88967c04d84185a --- mistral/tests/unit/lang/v2/test_tasks.py | 8 ++++---- mistral/tests/unit/lang/v2/test_workflows.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mistral/tests/unit/lang/v2/test_tasks.py b/mistral/tests/unit/lang/v2/test_tasks.py index c5f429367..50663c6ab 100644 --- a/mistral/tests/unit/lang/v2/test_tasks.py +++ b/mistral/tests/unit/lang/v2/test_tasks.py @@ -231,7 +231,7 @@ class TaskSpecValidationTest(v2_base.WorkflowSpecValidationTestCase): ({'wait-before': '{{ 1 }}'}, False), ({'wait-before': '{{ * }}'}, True), ({'wait-before': -1}, True), - ({'wait-before': 1.0}, True), + ({'wait-before': 1.1}, True), ({'wait-before': '1'}, True), ({'wait-after': 1}, False), ({'wait-after': '<% 1 %>'}, False), @@ -239,7 +239,7 @@ class TaskSpecValidationTest(v2_base.WorkflowSpecValidationTestCase): ({'wait-after': '{{ 1 }}'}, False), ({'wait-after': '{{ * }}'}, True), ({'wait-after': -1}, True), - ({'wait-after': 1.0}, True), + ({'wait-after': 1.1}, True), ({'wait-after': '1'}, True), ({'timeout': 300}, False), ({'timeout': '<% 300 %>'}, False), @@ -247,7 +247,7 @@ class TaskSpecValidationTest(v2_base.WorkflowSpecValidationTestCase): ({'timeout': '{{ 300 }}'}, False), ({'timeout': '{{ * }}'}, True), ({'timeout': -300}, True), - ({'timeout': 300.0}, True), + ({'timeout': 300.1}, True), ({'timeout': '300'}, True), ({'pause-before': False}, False), ({'pause-before': '<% False %>'}, False), @@ -261,7 +261,7 @@ class TaskSpecValidationTest(v2_base.WorkflowSpecValidationTestCase): ({'concurrency': '{{ 10 }}'}, False), ({'concurrency': '{{ * }}'}, True), ({'concurrency': -10}, True), - ({'concurrency': 10.0}, True), + ({'concurrency': 10.1}, True), ({'concurrency': '10'}, True) ] diff --git a/mistral/tests/unit/lang/v2/test_workflows.py b/mistral/tests/unit/lang/v2/test_workflows.py index 1d87da10f..f8d8ee173 100644 --- a/mistral/tests/unit/lang/v2/test_workflows.py +++ b/mistral/tests/unit/lang/v2/test_workflows.py @@ -352,7 +352,7 @@ class WorkflowSpecValidationTest(base.WorkflowSpecValidationTestCase): ({'wait-before': '{{ 1 }}'}, False), ({'wait-before': '{{ * }}'}, True), ({'wait-before': -1}, True), - ({'wait-before': 1.0}, True), + ({'wait-before': 1.1}, True), ({'wait-before': '1'}, True), ({'wait-after': 1}, False), ({'wait-after': '<% 1 %>'}, False), @@ -360,7 +360,7 @@ class WorkflowSpecValidationTest(base.WorkflowSpecValidationTestCase): ({'wait-after': '{{ 1 }}'}, False), ({'wait-after': '{{ * }}'}, True), ({'wait-after': -1}, True), - ({'wait-after': 1.0}, True), + ({'wait-after': 1.1}, True), ({'wait-after': '1'}, True), ({'timeout': 300}, False), ({'timeout': '<% 300 %>'}, False), @@ -368,7 +368,7 @@ class WorkflowSpecValidationTest(base.WorkflowSpecValidationTestCase): ({'timeout': '{{ 300 }}'}, False), ({'timeout': '{{ * }}'}, True), ({'timeout': -300}, True), - ({'timeout': 300.0}, True), + ({'timeout': 300.1}, True), ({'timeout': '300'}, True), ({'pause-before': False}, False), ({'pause-before': '<% False %>'}, False), @@ -382,7 +382,7 @@ class WorkflowSpecValidationTest(base.WorkflowSpecValidationTestCase): ({'concurrency': '{{ 10 }}'}, False), ({'concurrency': '{{ * }}'}, True), ({'concurrency': -10}, True), - ({'concurrency': 10.0}, True), + ({'concurrency': 10.1}, True), ({'concurrency': '10'}, True), ({'safe-rerun': True}, False), ({'safe-rerun': False}, False),