openstack
/
keystone
Code Issues Proposed changes

Merge "Fix assert test error under py3.6"

This commit is contained in:
Zuul 2018-03-16 17:56:11 +00:00 committed by Gerrit Code Review
parent b3f8f1e82a 4a1df081fd
commit 6528b396e8
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
keystone/tests/unit/test_v3_federation.py
View File

@ -13,6 +13,7 @@
import copy
import os
import random
import re
import subprocess
from testtools import matchers
import uuid
@ -4042,11 +4043,15 @@ class SAMLGenerationTests(test_v3.RestfulTestCase):
self.assertRaises(exception.SAMLSigningError,
keystone_idp._sign_assertion,
self.signed_assertion)
# The function __str__ in subprocess.CalledProcessError is different
# between py3.6 and lower python version.
expected_log = (
"Error when signing assertion, reason: Command '%s' returned "
"non-zero exit status %s %s\n" %
"non-zero exit status %s\.? %s\n" %
(CONF.saml.xmlsec1_binary, sample_returncode, sample_output))
self.assertEqual(expected_log, logger_fixture.output)
self.assertRegex(logger_fixture.output,
re.compile(r'%s' % expected_log))
@mock.patch('oslo_utils.fileutils.write_to_tempfile')
def test_sign_assertion_fileutils_exc(self, write_to_tempfile_mock):