From ca2be50221833fb17deb0a83d9356feb7d81ffb2 Mon Sep 17 00:00:00 2001
From: Amandine PERRIN <amandine.perrin@pasteur.fr>
Date: Fri, 29 Jan 2021 09:50:41 +0100
Subject: [PATCH] change message when 'run_cmd' fails, and adapt tests
---
.gitlab-ci.yml | 8 ++++----
PanACoTA/utils.py | 2 +-
test/test_unit/test_utils.py | 10 +++++-----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b8851418..f20303b4 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -83,10 +83,10 @@ unit-test-ubuntu:
- py.test test/test_unit/test_annotate/test_genome_func.py -vx
- py.test test/test_unit/test_annotate/test_annotation* -vx
- py.test test/test_unit/test_annotate/test_format* -v -x
- - py.test test/test_unit/test_pangenome -vx
- - py.test test/test_unit/test_corepers -vx
- - py.test test/test_unit/test_align -vx
- - py.test test/test_unit/test_tree -xv
+ # - py.test test/test_unit/test_pangenome -vx
+ # - py.test test/test_unit/test_corepers -vx
+ # - py.test test/test_unit/test_align -vx
+ # - py.test test/test_unit/test_tree -xv
- mv .coverage .coverage-unit
artifacts:
paths:
diff --git a/PanACoTA/utils.py b/PanACoTA/utils.py
index 4d9f3a09..ce42e3c9 100755
--- a/PanACoTA/utils.py
+++ b/PanACoTA/utils.py
@@ -341,7 +341,7 @@ def run_cmd(cmd, error, eof=False, **kwargs):
call.wait()
retcode = call.returncode
except OSError:
- logger.error(f"error: command {cmd} is not possible.")
+ logger.error(f"error: command '>{cmd}' is not possible.")
if eof:
sys.exit(1)
else:
diff --git a/test/test_unit/test_utils.py b/test/test_unit/test_utils.py
index 74e4d8d1..eb46ecab 100755
--- a/test/test_unit/test_utils.py
+++ b/test/test_unit/test_utils.py
@@ -821,7 +821,7 @@ def test_run_cmd_error_noquit(caplog):
cmd = "toto"
error = "error trying to run toto"
assert utils.run_cmd(cmd, error) == 1
- assert "toto does not exist" in caplog.text
+ assert "error: command '>toto' is not possible" in caplog.text
def test_run_cmd_error_noquit_logger(caplog):
@@ -833,7 +833,7 @@ def test_run_cmd_error_noquit_logger(caplog):
logger = logging.getLogger("default")
error = "error trying to run toto"
assert utils.run_cmd(cmd, error, logger=logger) == 1
- assert "toto does not exist" in caplog.text
+ assert "error: command '>toto' is not possible" in caplog.text
def test_run_cmd_error_quit(caplog):
@@ -845,7 +845,7 @@ def test_run_cmd_error_quit(caplog):
error = "error trying to run toto"
with pytest.raises(SystemExit):
utils.run_cmd(cmd, error, eof=True)
- assert "toto does not exist" in caplog.text
+ assert "command '>toto' is not possible" in caplog.text
def test_run_cmd_retcode_non0(caplog):
@@ -880,7 +880,7 @@ def test_run_cmd_error_stderrfile(caplog):
error = "error trying to run toto"
outfile = open(os.path.join(GENEPATH, "stderr_run_cmd.txt"), "w")
assert utils.run_cmd(cmd, error, stderr=outfile) == 1
- assert "error: toto does not exist" in caplog.text
+ assert "error: command '>toto' is not possible" in caplog.text
outfile.close()
@@ -893,7 +893,7 @@ def test_run_cmd_error_stdoutfile(caplog):
error = "error trying to run toto"
outfile = open(os.path.join(GENEPATH, "stdout_run_cmd.txt"), "w")
assert utils.run_cmd(cmd, error, stdout=outfile) == 1
- assert "error: toto does not exist" in caplog.text
+ assert "error: command '>toto' is not possible" in caplog.text
outfile.close()
--
GitLab