diff --git a/test/test_install/test_make_all-installed.py b/test/test_install/test_make_all-installed.py index 6ab0759a1dcbcd8a1da3640c2b22373ade6335eb..ddf292023d4a673b961715a1c398651348ef4040 100755 --- a/test/test_install/test_make_all-installed.py +++ b/test/test_install/test_make_all-installed.py @@ -41,7 +41,7 @@ def test_install_panacota(): error = "Error trying to uninstall PanACoTa" utils.run_cmd(cmd, error) assert not utils.check_installed("PanACoTA") - assert utils.check_installed("barrnap") + # assert utils.check_installed("barrnap") assert utils.check_installed("prokka") assert utils.check_installed("mash") assert utils.check_installed("FastTreeMP") @@ -50,7 +50,7 @@ def test_install_panacota(): error = "Error trying to install PanACoTA from base" utils.run_cmd(cmd, error) assert utils.check_installed("PanACoTA") - assert utils.check_installed("barrnap") + # assert utils.check_installed("barrnap") assert utils.check_installed("prokka") assert utils.check_installed("mash") assert utils.check_installed("FastTreeMP") diff --git a/test/test_install/test_make_ubuntu.py b/test/test_install/test_make_ubuntu.py index 23eb45b8f8715429000cbbbcdbf56dfe92002eee..4dcf80b54f71312b4a62fdb2b5b1613e50ceae47 100755 --- a/test/test_install/test_make_ubuntu.py +++ b/test/test_install/test_make_ubuntu.py @@ -25,6 +25,9 @@ def test_install_panacota_base_ubuntu(): Test that when installing from a computer containing the basic ubuntu, it installs PanACoTA, without any dependence (show warning message) """ + cmd = "python3 make uninstall" + error = "Error trying to uninstall PanACoTa" + utils.run_cmd(cmd, error) cmd = "python3 make" error = "Error trying to install PanACoTA from ubuntu" assert not utils.check_installed("barrnap") @@ -109,6 +112,9 @@ def test_develop(): """ Test installing PanACoTA in developer mode, when barrnap is already installed """ + cmd = "python3 make uninstall" + error = "Error trying to uninstall PanACoTa" + utils.run_cmd(cmd, error) assert not utils.check_installed("PanACoTA") assert not utils.check_installed("barrnap") assert not utils.check_installed("prokka") @@ -125,13 +131,6 @@ def test_develop(): stdout = "stdout_pip3show.out" with open(stdout, "w") as stdof: utils.run_cmd(cmd, err, stdout=stdof, stderr=stdof) - # Check that it was not installed - with open(stdout, "r") as stdof: - for line in stdof: - if line.startswith("Location"): - loc = line.split()[-1] - assert os.path.isdir(os.path.join(loc, "PanACoTA.egg-info")) - os.remove(stdout) logfile = "install.log" content = ["Installing developer packages needed for PanACoTA", "Some dependencies needed for some subcommands of PanACoTA are "