openstack/heat
Code Issues Proposed changes

Fix some functional tests for py3

Browse Source 
This fixes test_reload_on_sighup and test_stack_outputs
for py3.

Change-Id: Ibfb8f4eca0391b13bfec7c1e7352f8c31f8adb84
This commit is contained in:
rabi 2017-02-07 09:29:59 +05:30 committed by Thomas Herve
parent d42ce99218
commit 4f17a957a4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
heat_integrationtests/functional/test_reload_on_sighup.py
View File

@ -29,7 +29,8 @@ class ReloadOnSighupTest(functional_base.FunctionalTestsBase):
super(ReloadOnSighupTest, self).setUp()
def _is_mod_wsgi_daemon(self, service):
process = ''.join(['wsgi:', service[:9]]).replace('_', '-')
process = ''.join(['wsgi:',
service[:9]]).replace('_', '-').encode('utf-8')
s = subprocess.Popen(["ps", "ax"], stdout=subprocess.PIPE)
for x in s.stdout:
if re.search(process, x):

3
heat_integrationtests/functional/test_stack_outputs.py
View File

@ -46,7 +46,8 @@ outputs:
actual_list = self.client.stacks.output_list(
stack_identifier)['outputs']
self.assertEqual(expected_list, actual_list)
sorted_actual_list = sorted(actual_list, key=lambda x: x['output_key'])
self.assertEqual(expected_list, sorted_actual_list)
expected_output_a = {
u'output_value': u'a', u'output_key': u'resource_output_a',