diff --git a/src/python/pybis/tests/conftest.py b/src/python/pybis/tests/conftest.py index d399321ed65209fc297f9f76c1135e6c8633dc02..817430585d1db2f5b4068e6928c8c297ccd4feeb 100644 --- a/src/python/pybis/tests/conftest.py +++ b/src/python/pybis/tests/conftest.py @@ -2,11 +2,14 @@ import pytest from pybis import Openbis + @pytest.yield_fixture(scope="module") def openbis_instance(): - instance = Openbis("http://localhost:20000") + # instance = Openbis("http://localhost:20000") + # Test against a real instance + instance = Openbis("https://localhost:8443", verify_certificates=False) print("\nLOGGING IN...") - instance.login('admin','anypassword') + instance.login('admin', 'anypassword') yield instance instance.logout() print("LOGGED OUT...") diff --git a/src/python/pybis/tests/test_openbis.py b/src/python/pybis/tests/test_openbis.py index 6e6a4f8b7687680e4024c80f3d5920c837463d23..a6aa41297ac63cfcad2d8f1ab60b1fe0eb8c398a 100644 --- a/src/python/pybis/tests/test_openbis.py +++ b/src/python/pybis/tests/test_openbis.py @@ -4,16 +4,17 @@ import time from pybis import DataSet from pybis import Openbis + def test_token(openbis_instance): assert openbis_instance.hostname is not None - new_instance = Openbis(openbis_instance.url) + new_instance = Openbis(openbis_instance.url, verify_certificates=openbis_instance.verify_certificates) new_instance.login('admin', 'any_test_password') assert new_instance.token is not None assert new_instance.is_token_valid() is True new_instance.logout() assert new_instance.is_token_valid() is False - invalid_connection = Openbis(openbis_instance.url) + invalid_connection = Openbis(openbis_instance.url, verify_certificates=openbis_instance.verify_certificates) with pytest.raises(Exception): invalid_connection.login('invalid_username', 'invalid_password') assert invalid_connection.token is None @@ -28,16 +29,17 @@ def test_create_sample(openbis_instance): s2 = openbis_instance.get_sample(s.permid) assert s2 is not None + def test_cached_token(openbis_instance): openbis_instance.save_token() assert openbis_instance.token_path is not None - assert openbis_instance.get_cached_token() is not None + assert openbis_instance._get_cached_token() is not None - another_instance = Openbis(openbis_instance.url) + another_instance = Openbis(openbis_instance.url, verify_certificates=openbis_instance.verify_certificates) assert another_instance.is_token_valid() is True openbis_instance.delete_token() - assert openbis_instance.get_cached_token() is None + assert openbis_instance._get_cached_token() is None def test_get_sample_by_id(openbis_instance):