From abdc2ebdc82e8fdc8f08df2f84c69fd15c599f1c Mon Sep 17 00:00:00 2001 From: Justin Ludwig Date: Mon, 18 Sep 2023 17:27:23 -0700 Subject: [PATCH] ignore python version in ubuntu jammy install tests --- test_install/install_ubuntu_jammy.py | 6 +++--- test_install/install_upgrade_ubuntu_jammy.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test_install/install_ubuntu_jammy.py b/test_install/install_ubuntu_jammy.py index 153374d..0af696f 100644 --- a/test_install/install_ubuntu_jammy.py +++ b/test_install/install_ubuntu_jammy.py @@ -29,7 +29,7 @@ def test_dryrun_without_cnf(): assert read_line(proc).startswith("please download procustodibus-setup.conf") assert read_line(proc) == "WARNING libsodium not found" assert read_line(proc) == "OK will install libsodium" - assert read_line(proc) == "python 3.10.6 found at /usr/bin/python3" + assert read_line(proc).endswith("found at /usr/bin/python3") assert read_line(proc) == "WARNING python missing these packages: ensurepip" assert read_line(proc) == "OK will install missing packages" assert read_line(proc).startswith("WARNING python virtualenv not found") @@ -131,7 +131,7 @@ def test_install_and_remove_with_empty_credentials(): # noqa: CFQ001 write_cmd(proc, "y") assert read_line(proc) == "OK will install libsodium" assert read_until(proc, "installed libsodium")[-1] == "installed libsodium" - assert read_line(proc) == "python 3.10.6 found at /usr/bin/python3" + assert read_line(proc).endswith("found at /usr/bin/python3") assert read_line(proc) == "WARNING python missing these packages: ensurepip" # prompt "install missing packages? ([y]es, [q]uit)" write_cmd(proc, "y") @@ -251,7 +251,7 @@ def test_forced_install_with_empty_setup(): assert read_line(proc) == "WARNING libsodium not found" assert read_line(proc) == "OK will install libsodium" assert read_until(proc, "installed libsodium")[-1] == "installed libsodium" - assert read_line(proc) == "python 3.10.6 found at /usr/bin/python3" + assert read_line(proc).endswith("found at /usr/bin/python3") assert read_line(proc) == "WARNING python missing these packages: ensurepip" assert read_line(proc) == "OK will install missing packages" assert read_until(proc, "installed missing")[-1] == "installed missing packages" diff --git a/test_install/install_upgrade_ubuntu_jammy.py b/test_install/install_upgrade_ubuntu_jammy.py index fb67f2a..de69f01 100644 --- a/test_install/install_upgrade_ubuntu_jammy.py +++ b/test_install/install_upgrade_ubuntu_jammy.py @@ -38,7 +38,7 @@ def test_upgrade(): assert read_line(proc).endswith("owner is root") assert read_line(proc).endswith("group is root") assert read_line(proc).startswith("libsodium found") - assert read_line(proc) == "python 3.10.6 found at /usr/bin/python3" + assert read_line(proc).endswith("found at /usr/bin/python3") assert read_line(proc) == "python includes all packages needed for venv" assert read_line(proc).startswith("python virtualenv found") assert ( -- 2.45.2