Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Import more explicitly #24

Merged
merged 1 commit into from
Jul 1, 2022
Merged

Import more explicitly #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tests/testsuite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
from werkzeug.datastructures import Headers

from actinia_core.endpoints import create_endpoints
from actinia_core.core.common import redis_interface
from actinia_core.core.common.redis_interface import connect, disconnect
from actinia_core.core.common.app import flask_app, URL_PREFIX
from actinia_core.core.common.config import global_config
from actinia_core.core.common.user import ActiniaUser
Expand Down Expand Up @@ -98,7 +98,7 @@ def setUp(self):
if (global_config.REDIS_SERVER_PW
and global_config.REDIS_SERVER_PW is not None):
redis_args = (*redis_args, global_config.REDIS_SERVER_PW)
redis_interface.connect(*redis_args)
connect(*redis_args)

# create test user for roles user (more to come)
accessible_datasets = {"nc_spm_08": ["PERMANENT",
Expand Down Expand Up @@ -132,7 +132,7 @@ def tearDown(self):
# remove test user; disconnect redis
for user in self.users_list:
user.delete()
redis_interface.disconnect()
disconnect()

def createUser(self, name="guest", role="guest",
group="group", password="abcdefgh",
Expand Down