jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/333146 )

Change subject: Fix pytest-httpbin support breaking Python 2.6 builds ......................................................................

Fix pytest-httpbin support breaking Python 2.6 builds

Bug: T155208 Change-Id: I482df3e10bd684d35abd9d72435fd48f2f3e0fd7 --- M tests/aspects.py 1 file changed, 2 insertions(+), 1 deletion(-)

Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified

diff --git a/tests/aspects.py b/tests/aspects.py index 993f9cd..7a2c48a 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -502,7 +502,8 @@

# If pytest_httpbin will be used during tests, then remove httpbin.org from sites. if httpbin_used: - cls.sites = {k: v for k, v in cls.sites.items() if 'httpbin.org' not in v['hostname']} + cls.sites = dict((k, v) for k, v in cls.sites.items() + if 'httpbin.org' not in v['hostname'])

for key, data in cls.sites.items(): if 'hostname' not in data: