From 4d8d102ffbd0d66ebf1aef24836414c75073df14 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 9 Nov 2015 13:29:57 -0800 Subject: [PATCH] Fix unittests jaraco.functools 1.6 is broken and is pulled in by the irc lib. Use an older version to avoid the brokenness. Use a real url in the fake connection url as this is checked for correctness when creating elasticsearch transport objects. Change-Id: I41b5868c0c055297bb9ead1ad96486afeed9cce5 --- elastic_recheck/tests/unit/test_results.py | 2 +- requirements.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/elastic_recheck/tests/unit/test_results.py b/elastic_recheck/tests/unit/test_results.py index 7ac439c1..dc7b0a22 100644 --- a/elastic_recheck/tests/unit/test_results.py +++ b/elastic_recheck/tests/unit/test_results.py @@ -124,7 +124,7 @@ class TestSearchEngine(tests.TestCase): def setUp(self): super(TestSearchEngine, self).setUp() - self.engine = results.SearchEngine('fake-url') + self.engine = results.SearchEngine('http://fake-url') self.query = 'message:"foo" AND tags:"console"' def test_search_not_recent(self, search_mock): diff --git a/requirements.txt b/requirements.txt index 617fa206..e01268c9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,10 @@ pytz pyelasticsearch<1.0 gerritlib python-daemon<2.0 # BUg https://storyboard.openstack.org/#!/story/2000107 +# irc depends on jaraco modules. jaraco.functools 1.6 attempts to import +# backports which do not exist. This appears to be a dependency issue +# upstream. Avoid this by forcing the use of older jaraco.functools. +jaraco.functools<1.6 irc!=11.1 pyyaml lockfile