From 04ae7ff9d9f3f06fcb29f866709b79e149f51aa9 Mon Sep 17 00:00:00 2001
From: vermeul <swen@ethz.ch>
Date: Mon, 9 Aug 2021 17:23:10 +0200
Subject: [PATCH] black code formatting, added another_openbis_instance fixture
---
pybis/src/python/tests/conftest.py | 38 ++++++++++++++++++++----------
1 file changed, 26 insertions(+), 12 deletions(-)
diff --git a/pybis/src/python/tests/conftest.py b/pybis/src/python/tests/conftest.py
index 4a9878fbdd3..c1f92f01670 100644
--- a/pybis/src/python/tests/conftest.py
+++ b/pybis/src/python/tests/conftest.py
@@ -1,18 +1,33 @@
-import pytest
+import os
import time
+import pytest
from pybis import Openbis
-openbis_url = 'https://localhost:8443'
-admin_username = 'admin'
-admin_password = 'changeit'
+
+openbis_url = "https://localhost:8443"
+admin_username = "admin"
+admin_password = "changeit"
+
@pytest.fixture(scope="module")
def openbis_instance():
instance = Openbis(
- url=openbis_url,
- verify_certificates=False,
- #allow_http_but_do_not_use_this_in_production_and_only_within_safe_networks=True
+ url=openbis_url,
+ verify_certificates=False,
+ )
+ print("\nLOGGING IN...")
+ instance.login(admin_username, admin_password)
+ yield instance
+ instance.logout()
+ print("LOGGED OUT...")
+
+
+@pytest.fixture(scope="module")
+def other_openbis_instance():
+ instance = Openbis(
+ url=openbis_url,
+ verify_certificates=False,
)
print("\nLOGGING IN...")
instance.login(admin_username, admin_password)
@@ -24,15 +39,14 @@ def openbis_instance():
@pytest.fixture(scope="module")
def space():
o = Openbis(
- url=openbis_url,
- verify_certificates=False,
- #allow_http_but_do_not_use_this_in_production_and_only_within_safe_networks=True
+ url=openbis_url,
+ verify_certificates=False,
)
o.login(admin_username, admin_password)
# create a space
- timestamp = time.strftime('%a_%y%m%d_%H%M%S').upper()
- space_name = 'test_space_' + timestamp
+ timestamp = time.strftime("%a_%y%m%d_%H%M%S").upper()
+ space_name = "test_space_" + timestamp
space = o.new_space(code=space_name)
space.save()
space_exists = o.get_space(code=space_name)
--
GitLab