Skip to content
Snippets Groups Projects
Verified Commit 3249d161 authored by Martin Weise's avatar Martin Weise
Browse files

Fixed lib and Python-services 


Signed-off-by: Martin Weise's avatarMartin Weise <martin.weise@tuwien.ac.at>
parent 2032ddeb
Branches
Tags
2 merge requests!387Wrong model,!384Wrong model
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 1430 additions and 899 deletions
.gitlab-ci.yml
+ 5
− 5
View file @ 3249d161
......@@ -304,7 +304,7 @@ test-analyse-service:
script:
- "pip install pipenv"
- "pipenv install gunicorn && pipenv install --dev --system --deploy"
- cd ./dbrepo-analyse-service/ && coverage run -m pytest tests/test_determine_dt.py tests/test_determine_pk.py tests/test_s3_client.py --junitxml=report.xml && coverage html --omit="tests/*" && coverage report --omit="tests/*" > ./coverage.txt
- cd ./dbrepo-analyse-service/ && coverage run -m pytest tests/test_determine_dt.py tests/test_determine_pk.py tests/test_s3_client.py && coverage html --omit="tests/*" && coverage report --omit="tests/*" > ./coverage.txt
- "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
artifacts:
when: always
......@@ -326,7 +326,7 @@ test-auth-service-init:
- "pip install pipenv"
- "pipenv install gunicorn && pipenv install --dev --system --deploy"
script:
- cd ./dbrepo-auth-service/init/ && coverage run -m pytest tests/test_unit_app.py --junitxml=report.xml && coverage html --omit="tests/*" && coverage report --omit="tests/*" > ./coverage.txt
- cd ./dbrepo-auth-service/init/ && coverage run -m pytest tests/test_unit_app.py && coverage html --omit="tests/*" && coverage report --omit="tests/*" > ./coverage.txt
- "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
artifacts:
when: always
......@@ -357,7 +357,7 @@ test-search-service:
script:
- "pip install pipenv"
- "pipenv install gunicorn && pipenv install --dev --system --deploy"
- cd ./dbrepo-search-service/ && coverage run -m pytest tests/test_app.py tests/test_jwt.py tests/test_opensearch_client.py tests/test_keycloak_client.py --junitxml=report.xml && coverage html && coverage report > ./coverage.txt
- cd ./dbrepo-search-service/ && coverage run --rcfile=.coveragerc -m pytest tests/test_app.py tests/test_jwt.py tests/test_opensearch_client.py tests/test_keycloak_client.py && coverage html && coverage report > ./coverage.txt
- "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
artifacts:
when: always
......@@ -381,7 +381,7 @@ test-search-service-init:
script:
- "pip install pipenv"
- "pipenv install gunicorn && pipenv install --dev --system --deploy"
- cd ./dbrepo-search-service/init/ && coverage run -m pytest tests/test_app.py tests/test_keycloak_client.py tests/test_opensearch_client.py --junitxml=report.xml && coverage html && coverage report > ./coverage.txt
- cd ./dbrepo-search-service/init/ && coverage run --rcfile=.coveragerc -m pytest tests/test_app.py tests/test_keycloak_client.py tests/test_opensearch_client.py && coverage html && coverage report > ./coverage.txt
- "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
artifacts:
when: always
......@@ -405,7 +405,7 @@ test-lib:
script:
- "pip install pipenv"
- "pipenv install gunicorn && pipenv install --dev --system --deploy"
- cd ./lib/python/ && coverage run -m pytest tests/test_unit_container.py tests/test_unit_concept.py tests/test_unit_database.py tests/test_unit_identifier.py tests/test_unit_license.py tests/test_unit_query.py tests/test_unit_rest_client.py tests/test_unit_table.py tests/test_unit_user.py tests/test_unit_view.py tests/test_unit_unit.py --junitxml=report.xml && coverage html --omit="tests/*" && coverage report --omit="tests/*" > ./coverage.txt
- cd ./lib/python/ && coverage run -rcfile=.coveragerc -m pytest tests/test_unit_container.py tests/test_unit_concept.py tests/test_unit_database.py tests/test_unit_identifier.py tests/test_unit_license.py tests/test_unit_query.py tests/test_unit_rest_client.py tests/test_unit_table.py tests/test_unit_user.py tests/test_unit_view.py tests/test_unit_unit.py && coverage html && coverage report > ./coverage.txt
- "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
artifacts:
when: always
......
dbrepo-search-service/.coveragerc
+ 8
− 3
View file @ 3249d161
[report]
format = html
omit =
*/test/*
*/omlib/*
*/init/*
\ No newline at end of file
# omit tests
./tests/*
# omit ext lib
./omlib/*
[html]
directory = htmlcov
\ No newline at end of file
dbrepo-search-service/init/.coveragerc
+ 7
− 2
View file @ 3249d161
[report]
format = html
omit =
# omit tests
./test/*
\ No newline at end of file
./tests/*
# omit ext lib
./omlib/*
[html]
directory = htmlcov
\ No newline at end of file
dbrepo-search-service/init/clients/opensearch_client.py
+ 2
− 2
View file @ 3249d161
......@@ -51,7 +51,7 @@ class OpenSearchClient:
http_auth=(self.username, self.password))
return self.instance
def update_database(self, database_id: int, data: Database) -> Database:
def update_database(self, database_id: str, data: Database) -> Database:
"""
Updates the database data with given id.
......@@ -66,7 +66,7 @@ class OpenSearchClient:
response: dict = self._instance().get(index="database", id=database_id)
return Database.model_validate(response["_source"])
def delete_database(self, database_id: int) -> None:
def delete_database(self, database_id: str) -> None:
"""
Deletes the database data with given id.
......
dbrepo-search-service/init/tests/test_opensearch_client.py
+ 46
− 42
View file @ 3249d161
import os
import unittest
import opensearchpy
import os
from dbrepo.api.dto import Database, Table, Column, ColumnType, Constraints, PrimaryKey, \
ConceptBrief, UnitBrief, UserBrief, ContainerBrief, ImageBrief, TableBrief, ColumnBrief
from opensearchpy import NotFoundError
from clients.opensearch_client import OpenSearchClient
req = Database(id=1,
req = Database(id="209acf92-5c9b-4633-ad99-113c86f6e948",
name="Test",
internal_name="test_tuw1",
owner=UserBrief(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", username="foo"),
......@@ -16,16 +16,15 @@ req = Database(id=1,
exchange_name="dbrepo",
is_public=True,
is_schema_public=True,
container=ContainerBrief(id=1,
container=ContainerBrief(id="7efe8b27-6cdc-4387-80e3-92ee28f4a7c5",
name="MariaDB",
internal_name="mariadb",
host="data-db",
image=ImageBrief(id=1,
image=ImageBrief(id="f97791b4-baf4-4b18-8f7d-3084818e6549",
name="mariadb",
version="11.1.3",
jdbc_method="mariadb")),
tables=[Table(id=1,
database_id=1,
tables=[Table(id="f94a6164-cad4-4873-a9fd-3fe5313b2e95",
database_id="209acf92-5c9b-4633-ad99-113c86f6e948",
name="Data",
internal_name="data",
owner=UserBrief(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", username="foo"),
......@@ -35,9 +34,9 @@ req = Database(id=1,
routing_key="dbrepo.1.1",
is_public=True,
is_schema_public=True,
columns=[Column(id=1,
database_id=1,
table_id=1,
columns=[Column(id="7bef7e68-88f1-438e-9b94-0a77afd21471",
database_id="209acf92-5c9b-4633-ad99-113c86f6e948",
table_id="f94a6164-cad4-4873-a9fd-3fe5313b2e95",
name="ID",
ord=0,
internal_name="id",
......@@ -45,8 +44,9 @@ req = Database(id=1,
is_null_allowed=False,
size=20,
d=0,
concept=ConceptBrief(id=1, uri="http://www.wikidata.org/entity/Q2221906"),
unit=UnitBrief(id=1,
concept=ConceptBrief(id="fb32ecf6-1f68-49b4-85ee-04e76263cbef",
uri="http://www.wikidata.org/entity/Q2221906"),
unit=UnitBrief(id="a67d735e-32ef-4917-b412-fe099c6757a1",
uri="http://www.ontology-of-units-of-measure.org/resource/om-2/degreeCelsius"),
val_min=0,
val_max=10)]
......@@ -56,7 +56,7 @@ req = Database(id=1,
class OpenSearchClientTest(unittest.TestCase):
def test_update_database_succeeds(self):
req.tables = [Table(id=1,
req.tables = [Table(id="f94a6164-cad4-4873-a9fd-3fe5313b2e95",
name="Test Table",
internal_name="test_table",
queue_name="dbrepo",
......@@ -64,9 +64,12 @@ class OpenSearchClientTest(unittest.TestCase):
is_public=True,
is_schema_public=True,
database_id=req.id,
constraints=Constraints(uniques=[], foreign_keys=[], checks=[],
primary_key=[PrimaryKey(id=1,
table=TableBrief(id=1,
constraints=Constraints(uniques=[],
foreign_keys=[],
checks=[],
primary_key=[PrimaryKey(id="f0d4dfdf-d987-4c73-aa40-1038db79bb31",
table=TableBrief(
id="f94a6164-cad4-4873-a9fd-3fe5313b2e95",
database_id=req.id,
name="Test Table",
internal_name="test_table",
......@@ -74,17 +77,18 @@ class OpenSearchClientTest(unittest.TestCase):
is_schema_public=True,
is_versioned=True,
owned_by="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502"),
column=ColumnBrief(id=1,
column=ColumnBrief(
id="90d81c6a-e69a-4413-97b8-fd2266a6e641",
name="ID",
database_id=req.id,
table_id=1,
table_id="90d81c6a-e69a-4413-97b8-fd2266a6e641",
internal_name="id",
type=ColumnType.BIGINT))]),
is_versioned=True,
owner=UserBrief(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", username="foo"),
columns=[Column(id=1,
columns=[Column(id="c63bde4a-61e4-42f1-ab64-350579c0691f",
database_id=req.id,
table_id=1,
table_id="f94a6164-cad4-4873-a9fd-3fe5313b2e95",
ord=0,
name="ID",
internal_name="id",
......@@ -95,7 +99,7 @@ class OpenSearchClientTest(unittest.TestCase):
# test
database = OpenSearchClient().update_database(database_id=req.id, data=req)
self.assertEqual(1, database.id)
self.assertEqual("209acf92-5c9b-4633-ad99-113c86f6e948", database.id)
self.assertEqual("Test", database.name)
self.assertEqual("test_tuw1", database.internal_name)
self.assertEqual("c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", database.owner.id)
......@@ -104,34 +108,34 @@ class OpenSearchClientTest(unittest.TestCase):
self.assertEqual("foo", database.contact.username)
self.assertEqual("dbrepo", database.exchange_name)
self.assertEqual(True, database.is_public)
self.assertEqual(1, database.container.id)
self.assertEqual("7efe8b27-6cdc-4387-80e3-92ee28f4a7c5", database.container.id)
# ...
self.assertEqual(1, database.container.image.id)
self.assertEqual("f97791b4-baf4-4b18-8f7d-3084818e6549", database.container.image.id)
# ...
self.assertEqual(1, len(database.tables))
self.assertEqual(1, database.tables[0].id)
self.assertEqual("f94a6164-cad4-4873-a9fd-3fe5313b2e95", database.tables[0].id)
self.assertEqual("Test Table", database.tables[0].name)
self.assertEqual("test_table", database.tables[0].internal_name)
self.assertEqual("dbrepo", database.tables[0].queue_name)
self.assertEqual("dbrepo.test_tuw1.test_table", database.tables[0].routing_key)
self.assertEqual(True, database.tables[0].is_public)
self.assertEqual(1, database.tables[0].database_id)
self.assertEqual("209acf92-5c9b-4633-ad99-113c86f6e948", database.tables[0].database_id)
self.assertEqual(True, database.tables[0].is_versioned)
self.assertEqual("c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", database.tables[0].owner.id)
self.assertEqual("foo", database.tables[0].owner.username)
self.assertEqual(1, len(database.tables[0].columns))
self.assertEqual(1, database.tables[0].columns[0].id)
self.assertEqual("c63bde4a-61e4-42f1-ab64-350579c0691f", database.tables[0].columns[0].id)
self.assertEqual("ID", database.tables[0].columns[0].name)
self.assertEqual("id", database.tables[0].columns[0].internal_name)
self.assertEqual(ColumnType.BIGINT, database.tables[0].columns[0].type)
self.assertEqual(1, database.tables[0].columns[0].database_id)
self.assertEqual(1, database.tables[0].columns[0].table_id)
self.assertEqual("209acf92-5c9b-4633-ad99-113c86f6e948", database.tables[0].columns[0].database_id)
self.assertEqual("f94a6164-cad4-4873-a9fd-3fe5313b2e95", database.tables[0].columns[0].table_id)
self.assertEqual(False, database.tables[0].columns[0].is_null_allowed)
def test_update_database_create_succeeds(self):
# test
database = OpenSearchClient().update_database(database_id=req.id, data=req)
self.assertEqual(1, database.id)
self.assertEqual("209acf92-5c9b-4633-ad99-113c86f6e948", database.id)
self.assertEqual("Test", database.name)
self.assertEqual("test_tuw1", database.internal_name)
self.assertEqual("c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", database.owner.id)
......@@ -140,9 +144,9 @@ class OpenSearchClientTest(unittest.TestCase):
self.assertEqual("foo", database.contact.username)
self.assertEqual("dbrepo", database.exchange_name)
self.assertEqual(True, database.is_public)
self.assertEqual(1, database.container.id)
self.assertEqual("7efe8b27-6cdc-4387-80e3-92ee28f4a7c5", database.container.id)
# ...
self.assertEqual(1, database.container.image.id)
self.assertEqual("f97791b4-baf4-4b18-8f7d-3084818e6549", database.container.image.id)
# ...
self.assertEqual(1, len(database.tables))
......
dbrepo-search-service/tests/test_app.py
+ 13
− 12
View file @ 3249d161
......@@ -8,7 +8,7 @@ from dbrepo.api.dto import Database, Table, Constraints, Column, ColumnType, Con
from app import app
req = Database(id=1,
req = Database(id="209acf92-5c9b-4633-ad99-113c86f6e948",
name="Test",
internal_name="test_tuw1",
owner=UserBrief(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", username="foo"),
......@@ -16,15 +16,17 @@ req = Database(id=1,
exchange_name="dbrepo",
is_public=True,
is_schema_public=True,
container=ContainerBrief(id=1,
container=ContainerBrief(id="7efe8b27-6cdc-4387-80e3-92ee28f4a7c5",
name="MariaDB",
internal_name="mariadb",
host="data-db",
image=ImageBrief(id=1,
image=ImageBrief(id="f97791b4-baf4-4b18-8f7d-3084818e6549",
name="mariadb",
version="11.1.3",
jdbc_method="mariadb")),
tables=[Table(id=1, database_id=1, name="Data", internal_name="data",
tables=[Table(id="f94a6164-cad4-4873-a9fd-3fe5313b2e95",
database_id="209acf92-5c9b-4633-ad99-113c86f6e948",
name="Data",
internal_name="data",
owner=UserBrief(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", username="foo"),
constraints=Constraints(uniques=[], foreign_keys=[], checks=[], primary_key=[]),
is_versioned=False,
......@@ -32,20 +34,19 @@ req = Database(id=1,
routing_key="dbrepo.1.1",
is_public=True,
is_schema_public=True,
columns=[Column(id=1,
database_id=1,
table_id=1,
ord=0,
columns=[Column(id="7bef7e68-88f1-438e-9b94-0a77afd21471",
database_id="209acf92-5c9b-4633-ad99-113c86f6e948",
table_id="f94a6164-cad4-4873-a9fd-3fe5313b2e95",
name="ID",
ord=0,
internal_name="id",
type=ColumnType.BIGINT,
is_public=True,
is_null_allowed=False,
size=20,
d=0,
concept=ConceptBrief(id=1,
concept=ConceptBrief(id="fb32ecf6-1f68-49b4-85ee-04e76263cbef",
uri="http://www.wikidata.org/entity/Q2221906"),
unit=UnitBrief(id=1,
unit=UnitBrief(id="a67d735e-32ef-4917-b412-fe099c6757a1",
uri="http://www.ontology-of-units-of-measure.org/resource/om-2/degreeCelsius"),
val_min=0,
val_max=10)]
......
lib/python/.coveragerc 0 → 100644
+ 10
− 0
View file @ 3249d161
[report]
format = html
omit =
# omit tests
./tests/*
# omit ext lib
./omlib/*
[html]
directory = htmlcov
\ No newline at end of file
lib/python/dbrepo/RestClient.py
+ 45
− 45
View file @ 3249d161
This diff is collapsed.
lib/python/tests/test_unit_concept.py
+ 1
− 1
View file @ 3249d161
......@@ -11,7 +11,7 @@ class ContainerUnitTest(unittest.TestCase):
def test_get_concepts_succeeds(self):
with requests_mock.Mocker() as mock:
exp = [ConceptBrief(id=1,
exp = [ConceptBrief(id="65586aef-f5b0-446f-b2e1-9dc2a3c0c359",
uri="http://dbpedia.org/page/Category:Precipitation",
name="Precipitation")]
# mock
......
lib/python/tests/test_unit_container.py
+ 43
− 32
View file @ 3249d161
......@@ -12,12 +12,12 @@ class ContainerUnitTest(unittest.TestCase):
def test_create_container_succeeds(self):
with requests_mock.Mocker() as mock:
exp = Container(id=1,
exp = Container(id="44d811a8-4019-46ba-bd57-ea10a2eb0c74",
name="MariaDB 10.11.3",
internal_name="mariadb_10_11_3",
host="data-db",
port=12345,
image=Image(id=1,
image=Image(id="b104648b-54d2-4d72-9834-8e0e6d428b39",
registry="docker.io",
name="mariadb",
version="10.11.3",
......@@ -33,7 +33,8 @@ class ContainerUnitTest(unittest.TestCase):
mock.post('/api/container', json=exp.model_dump(), status_code=201)
# test
response = RestClient(username="foo", password="bar").create_container(name='MariaDB 10.11.3',
host='data-db2', image_id=1,
host='data-db2',
image_id="b104648b-54d2-4d72-9834-8e0e6d428b39",
privileged_username='root',
privileged_password='dbrepo',
port=3306)
......@@ -42,7 +43,8 @@ class ContainerUnitTest(unittest.TestCase):
def test_create_container_anonymous_fails(self):
# test
try:
response = RestClient().create_container(name='MariaDB 10.11.3', host='data-db2', image_id=1,
response = RestClient().create_container(name='MariaDB 10.11.3', host='data-db2',
image_id="b104648b-54d2-4d72-9834-8e0e6d428b39",
privileged_username='root', privileged_password='dbrepo',
port=3306)
except AuthenticationError:
......@@ -55,7 +57,8 @@ class ContainerUnitTest(unittest.TestCase):
# test
try:
response = RestClient(username="foo", password="bar").create_container(name='MariaDB 10.11.3',
host='data-db2', image_id=1,
host='data-db2',
image_id="b104648b-54d2-4d72-9834-8e0e6d428b39",
privileged_username='root',
privileged_password='dbrepo',
port=3306)
......@@ -69,7 +72,8 @@ class ContainerUnitTest(unittest.TestCase):
# test
try:
response = RestClient(username="foo", password="bar").create_container(name='MariaDB 10.11.3',
host='data-db2', image_id=1,
host='data-db2',
image_id="b104648b-54d2-4d72-9834-8e0e6d428b39",
privileged_username='root',
privileged_password='dbrepo',
port=3306)
......@@ -83,7 +87,8 @@ class ContainerUnitTest(unittest.TestCase):
# test
try:
response = RestClient(username="foo", password="bar").create_container(name='MariaDB 10.11.3',
host='data-db2', image_id=1,
host='data-db2',
image_id="b104648b-54d2-4d72-9834-8e0e6d428b39",
privileged_username='root',
privileged_password='dbrepo',
port=3306)
......@@ -97,7 +102,8 @@ class ContainerUnitTest(unittest.TestCase):
# test
try:
response = RestClient(username="foo", password="bar").create_container(name='MariaDB 10.11.3',
host='data-db2', image_id=1,
host='data-db2',
image_id="b104648b-54d2-4d72-9834-8e0e6d428b39",
privileged_username='root',
privileged_password='dbrepo',
port=3306)
......@@ -111,7 +117,8 @@ class ContainerUnitTest(unittest.TestCase):
# test
try:
response = RestClient(username="foo", password="bar").create_container(name='MariaDB 10.11.3',
host='data-db2', image_id=1,
host='data-db2',
image_id="b104648b-54d2-4d72-9834-8e0e6d428b39",
privileged_username='root',
privileged_password='dbrepo',
port=3306)
......@@ -129,14 +136,13 @@ class ContainerUnitTest(unittest.TestCase):
def test_get_containers_succeeds(self):
with requests_mock.Mocker() as mock:
exp = [
ContainerBrief(id=1,
ContainerBrief(id="44d811a8-4019-46ba-bd57-ea10a2eb0c74",
name="MariaDB 10.11.3",
internal_name="mariadb_10_11_3",
running=True,
image=ImageBrief(id=1,
image=ImageBrief(id="b104648b-54d2-4d72-9834-8e0e6d428b39",
name="mariadb",
version="10.11.3",
jdbc_method="mariadb"),
version="10.11.3"),
hash="f829dd8a884182d0da846f365dee1221fd16610a14c81b8f9f295ff162749e50")
]
# mock
......@@ -157,12 +163,12 @@ class ContainerUnitTest(unittest.TestCase):
def test_get_container_succeeds(self):
with requests_mock.Mocker() as mock:
exp = Container(id=1,
exp = Container(id="",
name="MariaDB 10.11.3",
internal_name="mariadb_10_11_3",
host="data-db",
port=12345,
image=Image(id=1,
image=Image(id="b104648b-54d2-4d72-9834-8e0e6d428b39",
registry="docker.io",
name="mariadb",
version="10.11.3",
......@@ -175,82 +181,87 @@ class ContainerUnitTest(unittest.TestCase):
documentation="https://mariadb.com/kb/en/bigint/",
is_quoted=False, is_buildable=True)]))
# mock
mock.get('/api/container/1', json=exp.model_dump())
mock.get('/api/container/44d811a8-4019-46ba-bd57-ea10a2eb0c74', json=exp.model_dump())
# test
response = RestClient().get_container(container_id=1)
response = RestClient().get_container(container_id="44d811a8-4019-46ba-bd57-ea10a2eb0c74")
self.assertEqual(exp, response)
def test_get_container_404_fails(self):
with requests_mock.Mocker() as mock:
# mock
mock.get('/api/container/1', status_code=404)
mock.get('/api/container/44d811a8-4019-46ba-bd57-ea10a2eb0c74', status_code=404)
# test
try:
response = RestClient().get_container(container_id=1)
response = RestClient().get_container(container_id="44d811a8-4019-46ba-bd57-ea10a2eb0c74")
except NotExistsError:
pass
def test_get_container_unknown_fails(self):
with requests_mock.Mocker() as mock:
# mock
mock.get('/api/container/1', status_code=401)
mock.get('/api/container/44d811a8-4019-46ba-bd57-ea10a2eb0c74', status_code=401)
# test
try:
response = RestClient().get_container(container_id=1)
response = RestClient().get_container(container_id="44d811a8-4019-46ba-bd57-ea10a2eb0c74")
except ResponseCodeError:
pass
def test_delete_container_succeeds(self):
with requests_mock.Mocker() as mock:
# mock
mock.delete('/api/container/1', status_code=202)
mock.delete('/api/container/44d811a8-4019-46ba-bd57-ea10a2eb0c74', status_code=202)
# test
RestClient(username='foo', password='bar').delete_container(container_id=1)
RestClient(username='foo', password='bar').delete_container(
container_id="44d811a8-4019-46ba-bd57-ea10a2eb0c74")
def test_delete_container_400_fails(self):
with requests_mock.Mocker() as mock:
# mock
mock.delete('/api/container/1', status_code=400)
mock.delete('/api/container/44d811a8-4019-46ba-bd57-ea10a2eb0c74', status_code=400)
# test
try:
RestClient(username='foo', password='bar').delete_container(container_id=1)
RestClient(username='foo', password='bar').delete_container(
container_id="44d811a8-4019-46ba-bd57-ea10a2eb0c74")
except MalformedError:
pass
def test_delete_container_403_fails(self):
with requests_mock.Mocker() as mock:
# mock
mock.delete('/api/container/1', status_code=403)
mock.delete('/api/container/44d811a8-4019-46ba-bd57-ea10a2eb0c74', status_code=403)
# test
try:
RestClient(username='foo', password='bar').delete_container(container_id=1)
RestClient(username='foo', password='bar').delete_container(
container_id="44d811a8-4019-46ba-bd57-ea10a2eb0c74")
except ForbiddenError:
pass
def test_delete_container_404_fails(self):
with requests_mock.Mocker() as mock:
# mock
mock.delete('/api/container/1', status_code=404)
mock.delete('/api/container/44d811a8-4019-46ba-bd57-ea10a2eb0c74', status_code=404)
# test
try:
RestClient(username='foo', password='bar').delete_container(container_id=1)
RestClient(username='foo', password='bar').delete_container(
container_id="44d811a8-4019-46ba-bd57-ea10a2eb0c74")
except NotExistsError:
pass
def test_delete_container_unknown_fails(self):
with requests_mock.Mocker() as mock:
# mock
mock.delete('/api/container/1', status_code=200)
mock.delete('/api/container/44d811a8-4019-46ba-bd57-ea10a2eb0c74', status_code=200)
# test
try:
RestClient(username='foo', password='bar').delete_container(container_id=1)
RestClient(username='foo', password='bar').delete_container(
container_id="44d811a8-4019-46ba-bd57-ea10a2eb0c74")
except ResponseCodeError:
pass
def test_delete_container_anonymous_fails(self):
# test
try:
RestClient().delete_container(container_id=1)
RestClient().delete_container(container_id="44d811a8-4019-46ba-bd57-ea10a2eb0c74")
except AuthenticationError:
pass
......
lib/python/tests/test_unit_database.py
+ 200
− 160
View file @ 3249d161
This diff is collapsed.
lib/python/tests/test_unit_identifier.py
+ 289
− 207
View file @ 3249d161
This diff is collapsed.
lib/python/tests/test_unit_query.py
+ 167
− 90
View file @ 3249d161
This diff is collapsed.
lib/python/tests/test_unit_table.py
+ 399
− 189
View file @ 3249d161
This diff is collapsed.
lib/python/tests/test_unit_unit.py
+ 1
− 1
View file @ 3249d161
......@@ -11,7 +11,7 @@ class UserUnitTest(unittest.TestCase):
def test_get_units_succeeds(self):
with requests_mock.Mocker() as mock:
exp = [UnitBrief(id=1,
exp = [UnitBrief(id="d8eec1ab-7b37-4eb3-bdf7-b44a8b384c0b",
uri='http://www.ontology-of-units-of-measure.org/resource/om-2/CelsiusTemperature',
name='Celsius Temperature')]
# mock
......
lib/python/tests/test_unit_view.py
+ 194
− 108
View file @ 3249d161
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment