diff --git a/rhodecode/tests/lib/rc_commands/test_inactive_users.py b/rhodecode/tests/lib/rc_commands/test_inactive_users.py index a1f6ccbd..d4fcb813 100644 --- a/rhodecode/tests/lib/rc_commands/test_inactive_users.py +++ b/rhodecode/tests/lib/rc_commands/test_inactive_users.py @@ -1,6 +1,7 @@ import csv import tempfile from datetime import datetime, timedelta +from pathlib import Path import pytest @@ -72,21 +73,22 @@ class TestFilterInactiveUsers(object): prev_inactive_user.last_activity = activity_long_ago user_id = prev_inactive_user.user_id - with tempfile.NamedTemporaryFile(mode="w", newline="", encoding="utf-8", delete=False) as tmp: - path = tmp.name - w = csv.writer(tmp) - w.writerow(["user_id"]) - w.writerows([[user_id]]) + with tempfile.TemporaryDirectory() as td: + path = Path(td) / "data.csv" + with path.open("w", newline="", encoding="utf-8") as f: + w = csv.writer(f) + w.writerow(["user_id"]) + w.writerows([[user_id]]) - # reactivate user - inactive_user = User.get(user_id=user_id) - inactive_user.last_activity = datetime.now() + # reactivate user + inactive_user = User.get(user_id=user_id) + inactive_user.last_activity = datetime.now() - inactive_users, reactivated_users = filter_reactivated_users(path) + inactive_users, reactivated_users = filter_reactivated_users(str(path)) - assert len(reactivated_users) == 1 - assert len(inactive_users) == 0 - assert reactivated_users[0].user_id == user_id + assert len(reactivated_users) == 1 + assert len(inactive_users) == 0 + assert reactivated_users[0].user_id == user_id def test_diff__previously_inactive_user_remain_inactive(self, user_util): prev_inactive_user = user_util.create_user(username="user_to_be_removed") @@ -94,14 +96,15 @@ class TestFilterInactiveUsers(object): prev_inactive_user.last_activity = activity_long_ago user_id = prev_inactive_user.user_id - with tempfile.NamedTemporaryFile(mode="w", newline="", encoding="utf-8", delete=False) as tmp: - path = tmp.name - w = csv.writer(tmp) - w.writerow(["user_id"]) - w.writerows([[user_id]]) + with tempfile.TemporaryDirectory() as td: + path = Path(td) / "data.csv" + with path.open("w", newline="", encoding="utf-8") as f: + w = csv.writer(f) + w.writerow(["user_id"]) + w.writerows([[user_id]]) - inactive_users, reactivated_users = filter_reactivated_users(path) + inactive_users, reactivated_users = filter_reactivated_users(str(path)) - assert len(reactivated_users) == 0 - assert len(inactive_users) == 1 - assert inactive_users[0].user_id == user_id + assert len(reactivated_users) == 0 + assert len(inactive_users) == 1 + assert inactive_users[0].user_id == user_id