Skip to content

Commit

Permalink
test(pytest): adapt to fixture changes from default_user to user0
Browse files Browse the repository at this point in the history
  • Loading branch information
tiborsimko committed Sep 4, 2024
1 parent 13738ad commit 1350ad9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"htcondor>=9.0.17",
],
"tests": [
"pytest-reana>=0.95.0a2,<0.96.0",
"pytest-reana>=0.95.0a4,<0.96.0",
],
"ssh": [
"paramiko[gssapi]>=3.0.0",
Expand All @@ -64,7 +64,7 @@
"fs>=2.0",
"marshmallow>2.13.0,<3.0.0", # same upper pin as reana-server
"reana-commons[kubernetes] @ git+https://github.com/reanahub/reana-commons.git@0.95.0a4",
"reana-db>=0.95.0a2,<0.96.0",
"reana-db>=0.95.0a4,<0.96.0",
"retrying>=1.3.3",
]

Expand Down
10 changes: 5 additions & 5 deletions tests/test_job_manager.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# This file is part of REANA.
# Copyright (C) 2019, 2020, 2021, 2022, 2023 CERN.
# Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024 CERN.
#
# REANA is free software; you can redistribute it and/or modify it
# under the terms of the MIT License; see LICENSE file for more details.
Expand All @@ -26,7 +26,7 @@ def test_execute_kubernetes_job(
session,
sample_serial_workflow_in_db,
sample_workflow_workspace,
default_user,
user0,
kerberos_user_secrets,
corev1_api_client_with_user_secrets,
monkeypatch,
Expand All @@ -40,7 +40,7 @@ def test_execute_kubernetes_job(
expected_env_var = {env_var_key: env_var_value}
expected_image = "docker.io/library/busybox"
expected_command = "ls"
monkeypatch.setenv("REANA_USER_ID", str(default_user.id_))
monkeypatch.setenv("REANA_USER_ID", str(user0.id_))
job_manager = KubernetesJobManager(
docker_img=expected_image,
cmd=expected_command,
Expand Down Expand Up @@ -99,7 +99,7 @@ def test_stop_kubernetes_job(
sample_serial_workflow_in_db,
sample_workflow_workspace,
empty_user_secrets,
default_user,
user0,
corev1_api_client_with_user_secrets,
monkeypatch,
):
Expand All @@ -110,7 +110,7 @@ def test_stop_kubernetes_job(
expected_env_var_value = "value"
expected_image = "docker.io/library/busybox"
expected_command = ["ls"]
monkeypatch.setenv("REANA_USER_ID", str(default_user.id_))
monkeypatch.setenv("REANA_USER_ID", str(user0.id_))
job_manager = KubernetesJobManager(
docker_img=expected_image,
cmd=expected_command,
Expand Down

0 comments on commit 1350ad9

Please sign in to comment.