diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-08 18:01:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-08 18:01:30 +0000 |
| commit | 5a80c78ac18d8376f753ab78f9410fede38d040b (patch) | |
| tree | 5b4dd671eec42fb4dfc9454c093cfa0237fcaed8 | |
| parent | 215bbf87dfcbd22e691987053f882d32ef7e8216 (diff) | |
| parent | cfa84448e026805fa198b06fe06c9ccc2ebafd2c (diff) | |
| download | nova-5a80c78ac18d8376f753ab78f9410fede38d040b.tar.gz nova-5a80c78ac18d8376f753ab78f9410fede38d040b.tar.xz nova-5a80c78ac18d8376f753ab78f9410fede38d040b.zip | |
Merge "Fix verification in test_api_samples.py"
| -rw-r--r-- | nova/tests/integrated/test_api_samples.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index 3bcd737bb..81c8e91c0 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -178,6 +178,7 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): result = str(result) expected = expected.replace('int:', '') expected = expected % subs + expected = '^%s$' % expected match = re.match(expected, result) if not match: raise NoMatch(_('Values do not match:\n' @@ -225,7 +226,7 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): '(Z|(\+|-)\d{2}:\d{2}|\.\d{6})', 'password': '[0-9a-zA-Z]{1,12}', 'ip': '[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}', - 'ip6': '([0-9a-zA-Z]{1,4}:){1,7}:?[0-9a-zA-Z]', + 'ip6': '([0-9a-zA-Z]{1,4}:){1,7}:?[0-9a-zA-Z]{1,4}', 'id': '(?P<id>[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}' '-[0-9a-f]{4}-[0-9a-f]{12})', 'uuid': '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}' |