From 52ac2a6b4e77663b3832e486c1c47ac205f6e936 Mon Sep 17 00:00:00 2001
From: Amandine PERRIN <amandine.perrin@pasteur.fr>
Date: Thu, 7 Sep 2023 23:01:33 +0200
Subject: [PATCH] update test barrnap
---
test/test_install/test_make_all-installed.py | 4 ++--
test/test_install/test_make_ubuntu.py | 13 ++++++-------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/test/test_install/test_make_all-installed.py b/test/test_install/test_make_all-installed.py
index 6ab0759a..ddf29202 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 23eb45b8..4dcf80b5 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 "
--
GitLab