opendev/elastic-recheck
Code Issues Proposed changes

Cleanup tests

Browse Source 
Move test code into tests.
Remove last_failures test, as its replaced by other tests now.
Remove dead code.

Change-Id: I3514f62e003b1140fbe597cc91aea3089c268ac7
This commit is contained in:
Joe Gordon
2013-09-27 15:49:59 -07:00
parent 39b7ea7908
commit d209b83ee3
2 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
elastic_recheck/elasticRecheck.py
View File

@@ -158,32 +158,10 @@ class Classifier():
query['query']['query_string']['query'] = query['query']['query_string']['query'] % values
return query
def test(self):
query = self._apply_template(self.targeted_template, ('@tags:"console.html" AND @message:"Finished: FAILURE"', '34825', '3'))
results = self.es.search(query, size='10')
print results['hits']['total']
self._parse_results(results)
def hits_by_query(self, query, size=100):
es_query = self._apply_template(self.general_template, query)
return self.es.search(es_query, size=size)
def last_failures(self, size=10):
for x in self.queries:
self.log.debug("Looking for bug: https://bugs.launchpad.net/bugs/%s" % x['bug'])
results = self.hits_by_query(x['query'], size=size)
self._parse_results(results)
def _parse_results(self, results):
for x in results['hits']['hits']:
try:
change = x["_source"]['@fields']['build_change']
patchset = x["_source"]['@fields']['build_patchset']
self.log.debug("build_name %s" % x["_source"]['@fields']['build_name'])
self.log.debug("https://review.openstack.org/#/c/%(change)s/%(patchset)s" % locals())
except KeyError:
self.log.debug("build_name %s" % x["_source"]['@fields']['build_name'])
def classify(self, change_number, patch_number, comment):
"""Returns either None or a bug number"""
#Reload each time

6
elastic_recheck/tests/test_classifier.py
View File

@@ -27,8 +27,10 @@ class TestClassifier(testtools.TestCase):
self.assertNotEqual(self.classifier.queries, None)
def test_elasticSearch(self):
self.classifier.test()
self.classifier.last_failures()
query = self.classifier._apply_template(self.classifier.targeted_template,
('@tags:"console.html" AND @message:"Finished: FAILURE"', '34825', '3'))
results = self.classifier.es.search(query, size='10')
self.assertTrue(int(results['hits']['total']) > 0, ("unable to find hit"))
def test_ready(self):
self.assertTrue(self.classifier._is_ready('49282', '3',