aboutsummaryrefslogtreecommitdiff
path: root/delivery_merge/merge.py
diff options
context:
space:
mode:
Diffstat (limited to 'delivery_merge/merge.py')
-rw-r--r--delivery_merge/merge.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/delivery_merge/merge.py b/delivery_merge/merge.py
index fb291a2..56102b2 100644
--- a/delivery_merge/merge.py
+++ b/delivery_merge/merge.py
@@ -166,6 +166,9 @@ def integration_test(pkg_data, conda_env, results_root='.'):
if 'easy-install.pth' not in proc_pip_stderr:
proc_pip.check_returncode()
+ if 'consider upgrading' not in proc_pip_stderr:
+ proc_pip.check_returncode()
+
proc_pytest = sh("pytest", f"-v --junitxml={results}")
if proc_pytest.returncode:
print(proc_pytest.stderr.decode())