summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhurong <aaronzhu1121@gmail.com>2018-03-09 07:06:19 +0000
committerzhurong <aaronzhu1121@gmail.com>2018-03-10 06:12:35 +0000
commita682d5ee923912f9bdff49f9c5dc1847a40e7c33 (patch)
tree52547c05773723c2c274dd1d5e936b3ab8d77208
parentde53ba8f9a97ad30c492063d9cc497ca56093e38 (diff)
Make test allowed_pattern type same as the hot example and fix the gatestable/pike
In murano allowed_pattern set as: allowed_pattern: [A-Za-z0-9] But in hot example is set as: allowed_pattern: '[a-zA-Z0-9]*' So change the test template allowed_pattern. Change-Id: I89ac4ef9de5eb0a5176c9df2ce1f289ca0d2cc65
Notes
Notes (review): Code-Review+2: Felipe Monteiro <felipe.monteiro@att.com> Code-Review+2: zhurong <aaronzhu1121@gmail.com> Workflow+1: zhurong <aaronzhu1121@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 12 Mar 2018 00:54:37 +0000 Reviewed-on: https://review.openstack.org/551191 Project: openstack/murano Branch: refs/heads/stable/pike
-rw-r--r--murano/tests/unit/packages/hot_package/test.hot.1/Resources/FullTestName4
-rw-r--r--murano/tests/unit/packages/hot_package/test.hot.1/properties_manifest.yaml2
-rw-r--r--murano/tests/unit/packages/hot_package/test.hot.1/template.yaml4
-rw-r--r--murano/tests/unit/packages/hot_package/test_hot_package.py2
4 files changed, 6 insertions, 6 deletions
diff --git a/murano/tests/unit/packages/hot_package/test.hot.1/Resources/FullTestName b/murano/tests/unit/packages/hot_package/test.hot.1/Resources/FullTestName
index e1ded24..1dfd08e 100644
--- a/murano/tests/unit/packages/hot_package/test.hot.1/Resources/FullTestName
+++ b/murano/tests/unit/packages/hot_package/test.hot.1/Resources/FullTestName
@@ -16,7 +16,7 @@ parameters:
16 description: Range Description 16 description: Range Description
17 - allowed_values: [0, 1, 2, 3, 4] 17 - allowed_values: [0, 1, 2, 3, 4]
18 description: Allowed Values Description 18 description: Allowed Values Description
19 - allowed_pattern: [A-Za-z0-9] 19 - allowed_pattern: "[A-Za-z0-9]"
20 description: Allowed Pattern Description 20 description: Allowed Pattern Description
21 bar: 21 bar:
22 type: boolean 22 type: boolean
@@ -51,7 +51,7 @@ parameter_groups:
51 description: Range Description 51 description: Range Description
52 - allowed_values: [0, 1, 2, 3, 4] 52 - allowed_values: [0, 1, 2, 3, 4]
53 description: Allowed Values Description 53 description: Allowed Values Description
54 - allowed_pattern: [A-Za-z0-9] 54 - allowed_pattern: "[A-Za-z0-9]"
55 description: Allowed Pattern Description 55 description: Allowed Pattern Description
56 bar: 56 bar:
57 type: boolean 57 type: boolean
diff --git a/murano/tests/unit/packages/hot_package/test.hot.1/properties_manifest.yaml b/murano/tests/unit/packages/hot_package/test.hot.1/properties_manifest.yaml
index 7528f2c..96e8d0b 100644
--- a/murano/tests/unit/packages/hot_package/test.hot.1/properties_manifest.yaml
+++ b/murano/tests/unit/packages/hot_package/test.hot.1/properties_manifest.yaml
@@ -11,7 +11,7 @@ parameters:
11 max: 50 11 max: 50
12 - length: 12 - length:
13 min: 0 13 min: 0
14 - allowed_pattern: [A-Za-z0-9] 14 - allowed_pattern: "[A-Za-z0-9]"
15 param3: 15 param3:
16 type: number 16 type: number
17 constraints: 17 constraints:
diff --git a/murano/tests/unit/packages/hot_package/test.hot.1/template.yaml b/murano/tests/unit/packages/hot_package/test.hot.1/template.yaml
index e1ded24..1dfd08e 100644
--- a/murano/tests/unit/packages/hot_package/test.hot.1/template.yaml
+++ b/murano/tests/unit/packages/hot_package/test.hot.1/template.yaml
@@ -16,7 +16,7 @@ parameters:
16 description: Range Description 16 description: Range Description
17 - allowed_values: [0, 1, 2, 3, 4] 17 - allowed_values: [0, 1, 2, 3, 4]
18 description: Allowed Values Description 18 description: Allowed Values Description
19 - allowed_pattern: [A-Za-z0-9] 19 - allowed_pattern: "[A-Za-z0-9]"
20 description: Allowed Pattern Description 20 description: Allowed Pattern Description
21 bar: 21 bar:
22 type: boolean 22 type: boolean
@@ -51,7 +51,7 @@ parameter_groups:
51 description: Range Description 51 description: Range Description
52 - allowed_values: [0, 1, 2, 3, 4] 52 - allowed_values: [0, 1, 2, 3, 4]
53 description: Allowed Values Description 53 description: Allowed Values Description
54 - allowed_pattern: [A-Za-z0-9] 54 - allowed_pattern: "[A-Za-z0-9]"
55 description: Allowed Pattern Description 55 description: Allowed Pattern Description
56 bar: 56 bar:
57 type: boolean 57 type: boolean
diff --git a/murano/tests/unit/packages/hot_package/test_hot_package.py b/murano/tests/unit/packages/hot_package/test_hot_package.py
index 81985f8..54f2148 100644
--- a/murano/tests/unit/packages/hot_package/test_hot_package.py
+++ b/murano/tests/unit/packages/hot_package/test_hot_package.py
@@ -113,7 +113,7 @@ class TestHotPackage(test_base.MuranoTestCase):
113 self.assertEqual("$.bool().check($ in list(True, False))", param1.expr) 113 self.assertEqual("$.bool().check($ in list(True, False))", param1.expr)
114 self.assertEqual("$.string().check($ in list('bar'))." 114 self.assertEqual("$.string().check($ in list('bar'))."
115 "check(len($) <= 50).check(len($) >= 0)." 115 "check(len($) <= 50).check(len($) >= 0)."
116 "check(matches($, '['A-Za-z0-9']'))", param2.expr) 116 "check(matches($, '[A-Za-z0-9]'))", param2.expr)
117 self.assertEqual("$.int().check($ in list(0, 1, 2, 3, 4))" 117 self.assertEqual("$.int().check($ in list(0, 1, 2, 3, 4))"
118 ".check(len($) >= 0 and len($) <= 5)." 118 ".check(len($) >= 0 and len($) <= 5)."
119 "check($ >= 0 and $ <= 4)", param3.expr) 119 "check($ >= 0 and $ <= 4)", param3.expr)