Commit 4644356a authored by Maja-Olivia Lenz's avatar Maja-Olivia Lenz Committed by Markus Scheidgen
Browse files

Move elasticsearch

- Move elasticsearch to test_get_dataset so test_mapping
  can be tested locally without the need for elasticsearch
parent d80bb116
...@@ -21,14 +21,14 @@ from nomad.app.dcat.mapping import Mapping ...@@ -21,14 +21,14 @@ from nomad.app.dcat.mapping import Mapping
from tests.conftest import clear_elastic from tests.conftest import clear_elastic
from tests.app.test_app import BlueprintClient from tests.app.test_app import BlueprintClient
@pytest.fixture(scope='session') @pytest.fixture(scope='session')
def api(session_client): def api(session_client):
return BlueprintClient(session_client, '/dcat') return BlueprintClient(session_client, '/dcat')
@pytest.fixture(scope='module') @pytest.fixture(scope='module')
def example_entry(elastic_infra, test_user, other_test_user): def example_entry(test_user, other_test_user):
clear_elastic(elastic_infra)
entry = EntryMetadata( entry = EntryMetadata(
calc_id='test-id', calc_id='test-id',
...@@ -41,19 +41,21 @@ def example_entry(elastic_infra, test_user, other_test_user): ...@@ -41,19 +41,21 @@ def example_entry(elastic_infra, test_user, other_test_user):
formula='H20', formula='H20',
published=True) published=True)
entry.a_elastic.index()
yield entry yield entry
clear_elastic(elastic_infra)
def test_mapping(example_entry): def test_mapping(example_entry):
mapping = Mapping() mapping = Mapping()
mapping.map_entry(example_entry) mapping.map_entry(example_entry)
assert mapping.g is not None assert mapping.g is not None
print(mapping.g.serialize(format='xml').decode('utf-8')) # print(mapping.g.serialize(format='ttl').decode('utf-8'))
def test_get_dataset(api, example_entry): def test_get_dataset(elastic_infra, api, example_entry):
clear_elastic(elastic_infra)
example_entry.a_elastic.index()
calc_id = 'test-id' calc_id = 'test-id'
rv = api.get('/datasets/%s' % calc_id) rv = api.get('/datasets/%s' % calc_id)
assert rv.status_code == 200 assert rv.status_code == 200
clear_elastic(elastic_infra)
Markdown is supported
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