From afba5b2b7e539273002afef7244d7f76b2ed8223 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Mon, 13 Jun 2016 16:08:43 -0400 Subject: [PATCH] Fix e-r with fixtures 3.0.0 Fixtures 3.0.0 adds another parameter to MonkeyPatch fixture usage which is some kind of link back to the class being patched out. This makes the ER code pass under fixtures 3.0. Change-Id: Id19d0dde8fa558cbf3c76a66430170d0d5b0cd94 --- elastic_recheck/tests/unit/test_bot.py | 4 ++-- test-requirements.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/elastic_recheck/tests/unit/test_bot.py b/elastic_recheck/tests/unit/test_bot.py index ba1cd886..8b150651 100644 --- a/elastic_recheck/tests/unit/test_bot.py +++ b/elastic_recheck/tests/unit/test_bot.py @@ -106,7 +106,7 @@ class TestBotWithTestTools(tests.TestCase): self.fake_config.get('gerrit', 'key'), False) - def fake_print(self, channel, msg): + def fake_print(self, cls, channel, msg): reference = ("openstack/keystone change: https://review.openstack.org/" "64750 failed because of: " "gate-keystone-python26: " @@ -114,7 +114,7 @@ class TestBotWithTestTools(tests.TestCase): "gate-keystone-python27: unrecognized error") self.assertEqual(reference, msg) - def fake_display(self, channel, msg): + def fake_display(self, *args): return True def test_error_found(self): diff --git a/test-requirements.txt b/test-requirements.txt index a2d39db4..478a77d4 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,7 +2,7 @@ hacking>=0.10.0,<0.11 coverage>=3.6 discover -fixtures>=0.3.14 +fixtures>=3.0.0 python-subunit sphinx>=1.1.2,<1.2 oslo.sphinx