Commit 15ee4b40 authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Fixed search tests.

parent 478a0d77
Pipeline #53045 passed with stages
in 30 minutes and 39 seconds
...@@ -152,23 +152,10 @@ def create_owner_query(): ...@@ -152,23 +152,10 @@ def create_owner_query():
def create_search_parameters(): def create_search_parameters():
""" Helper that creates a request.args dict with isolated search parameters """ """ Helper that creates a request.args dict with isolated search parameters """
search_parameters = { return {
key: request.args.getlist(key) if search.search_quantities[key] else request.args.get(key) key: request.args.getlist(key) if search.search_quantities[key] else request.args.get(key)
for key in request.args.keys()} for key in request.args.keys()
search_parameters.pop('owner', None) if key in search.search_quantities}
search_parameters.pop('scroll', None)
search_parameters.pop('scroll_id', None)
search_parameters.pop('per_page', None)
search_parameters.pop('page', None)
search_parameters.pop('order', None)
search_parameters.pop('order_by', None)
search_parameters.pop('metrics', None)
search_parameters.pop('from_time', None)
search_parameters.pop('until_time', None)
search_parameters.pop('size', None)
search_parameters.pop('after', None)
return search_parameters
@ns.route('/') @ns.route('/')
......
...@@ -496,6 +496,9 @@ class TestUploads: ...@@ -496,6 +496,9 @@ class TestUploads:
assert rv.status_code == 200 assert rv.status_code == 200
today = datetime.datetime.utcnow().date()
class UploadFilesBasedTests: class UploadFilesBasedTests:
@staticmethod @staticmethod
...@@ -640,7 +643,7 @@ class TestRepo(): ...@@ -640,7 +643,7 @@ class TestRepo():
test_user: coe_repo.User, other_test_user: coe_repo.User): test_user: coe_repo.User, other_test_user: coe_repo.User):
clear_elastic(elastic_infra) clear_elastic(elastic_infra)
calc_with_metadata = CalcWithMetadata(upload_id=0, calc_id=0, upload_time=datetime.date.today()) calc_with_metadata = CalcWithMetadata(upload_id=0, calc_id=0, upload_time=today)
calc_with_metadata.files = ['test/mainfile.txt'] calc_with_metadata.files = ['test/mainfile.txt']
calc_with_metadata.apply_domain_metadata(normalized) calc_with_metadata.apply_domain_metadata(normalized)
...@@ -650,7 +653,7 @@ class TestRepo(): ...@@ -650,7 +653,7 @@ class TestRepo():
calc_with_metadata.update( calc_with_metadata.update(
calc_id='2', uploader=other_test_user.to_popo(), published=True, with_embargo=False, calc_id='2', uploader=other_test_user.to_popo(), published=True, with_embargo=False,
upload_time=datetime.date.today() - datetime.timedelta(days=5)) upload_time=today - datetime.timedelta(days=5))
calc_with_metadata.update( calc_with_metadata.update(
atoms=['Fe'], comment='this is a specific word', formula='AAA', basis_set='zzz') atoms=['Fe'], comment='this is a specific word', formula='AAA', basis_set='zzz')
search.Entry.from_calc_with_metadata(calc_with_metadata).save(refresh=True) search.Entry.from_calc_with_metadata(calc_with_metadata).save(refresh=True)
...@@ -724,15 +727,15 @@ class TestRepo(): ...@@ -724,15 +727,15 @@ class TestRepo():
assert key in results[0] assert key in results[0]
@pytest.mark.parametrize('calcs, start, end', [ @pytest.mark.parametrize('calcs, start, end', [
(2, datetime.date.today() - datetime.timedelta(days=6), datetime.date.today()), (2, today - datetime.timedelta(days=6), today),
(2, datetime.date.today() - datetime.timedelta(days=5), datetime.date.today()), (2, today - datetime.timedelta(days=5), today),
(1, datetime.date.today() - datetime.timedelta(days=4), datetime.date.today()), (1, today - datetime.timedelta(days=4), today),
(1, datetime.date.today(), datetime.date.today()), (1, today, today),
(1, datetime.date.today() - datetime.timedelta(days=6), datetime.date.today() - datetime.timedelta(days=5)), (1, today - datetime.timedelta(days=6), today - datetime.timedelta(days=5)),
(0, datetime.date.today() - datetime.timedelta(days=7), datetime.date.today() - datetime.timedelta(days=6)), (0, today - datetime.timedelta(days=7), today - datetime.timedelta(days=6)),
(2, None, None), (2, None, None),
(1, datetime.date.today(), None), (1, today, None),
(2, None, datetime.date.today()) (2, None, today)
]) ])
def test_search_time(self, client, example_elastic_calcs, no_warn, calcs, start, end): def test_search_time(self, client, example_elastic_calcs, no_warn, calcs, start, end):
query_string = '' query_string = ''
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment