openstack/cinder
Code Issues Proposed changes

Merge "Tests: Fix python version check"

Browse Source
This commit is contained in:
Zuul 2018-02-16 23:44:21 +00:00 committed by Gerrit Code Review
commit 1ce09013ff
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cinder/tests/unit/api/test_api_validation.py
View File

@ -239,7 +239,8 @@ class PatternPropertiesTestCase(APIValidationTestCase):
self.check_validation_error(self.post, body={'0123456789a': 'bar'}, self.check_validation_error(self.post, body={'0123456789a': 'bar'},
expected_detail=details) expected_detail=details)
if sys.version[:3] == '3.5': ver_info = sys.version_info
if ver_info.major == 3 and ver_info.minor >= 5:
detail = "expected string or bytes-like object" detail = "expected string or bytes-like object"
else: else:
detail = "expected string or buffer" detail = "expected string or buffer"