Fix template_utils tests for Python 3.4

Change-Id: I9e4df63771e8fdb6433e65faffedef60d0320062
Closes-Bug: #1384511
This commit is contained in:
Tetyana Lashchova
2014-10-27 18:02:13 +02:00
parent 73692bbe5e
commit dbe7208b04

View File

@@ -253,15 +253,15 @@ class ShellEnvironmentTest(testtools.TestCase):
request.urlopen('file://%s' % env_file1).AndReturn( request.urlopen('file://%s' % env_file1).AndReturn(
six.BytesIO(env1)) six.BytesIO(env1))
request.urlopen('file:///home/b/a.yaml').AndReturn( request.urlopen('file:///home/b/a.yaml').InAnyOrder().AndReturn(
six.BytesIO(self.template_a)) six.BytesIO(self.template_a))
request.urlopen('file:///home/b/b.yaml').AndReturn( request.urlopen('file:///home/b/b.yaml').InAnyOrder().AndReturn(
six.BytesIO(self.template_a)) six.BytesIO(self.template_a))
request.urlopen('file://%s' % env_file2).AndReturn( request.urlopen('file://%s' % env_file2).AndReturn(
six.BytesIO(env2)) six.BytesIO(env2))
request.urlopen('file:///home/b/a.yaml').AndReturn( request.urlopen('file:///home/b/a.yaml').InAnyOrder().AndReturn(
six.BytesIO(self.template_a)) six.BytesIO(self.template_a))
request.urlopen('file:///home/b/b.yaml').AndReturn( request.urlopen('file:///home/b/b.yaml').InAnyOrder().AndReturn(
six.BytesIO(self.template_a)) six.BytesIO(self.template_a))
self.m.ReplayAll() self.m.ReplayAll()