test refactor: try decouple admin tests from other tests

This commit is contained in:
Erik Sundell
2023-06-09 00:20:58 +02:00
parent 111e9bee86
commit b1c7e53be4
3 changed files with 7 additions and 7 deletions

View File

@@ -167,7 +167,7 @@ def run_test(
command = f"python3 /srv/src/bootstrap/bootstrap.py --version={upgrade_from}"
run_command(container_name, command)
command = f"python3 /srv/src/bootstrap/bootstrap.py {installer_args}"
command = f"python3 /srv/src/bootstrap/bootstrap.py {' '.join(installer_args)}"
run_command(container_name, command)
# Install pkgs from requirements in hub's pip, where
@@ -219,7 +219,7 @@ def main():
copy_parser.add_argument("dest")
run_test_parser = subparsers.add_parser("run-test")
run_test_parser.add_argument("--installer-args", default="")
run_test_parser.add_argument("--installer-args", action="append")
run_test_parser.add_argument("--upgrade-from", default="")
run_test_parser.add_argument("--bootstrap-pip-spec", default="/srv/src")
run_test_parser.add_argument("container_name")

View File

@@ -12,8 +12,8 @@ async def test_admin_login():
Test if the admin that was added during install can login with
the password provided.
"""
username = "admin"
password = "admin"
username = "test-admin-username"
password = "test-admin-password"
async with User(username, hub_url, partial(login_dummy, password=password)) as u:
await u.login()
@@ -24,8 +24,8 @@ async def test_admin_login():
@pytest.mark.parametrize(
"username, password",
[
("admin", ""),
("admin", "wrong_passw"),
("test-admin-username", ""),
("test-admin-username", "wrong_passw"),
("user", "password"),
],
)

View File

@@ -284,7 +284,7 @@ def ensure_user_environment(user_requirements_txt_file):
def ensure_admins(admin_password_list):
"""
Setup given list of users as admins.
Setup given list of user[:password] strings as admins.
"""
os.makedirs(STATE_DIR, mode=0o700, exist_ok=True)