From 74d5e972ad6e72dcb915d7336cf2397bf7d6fc73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Thu, 31 May 2018 16:05:59 +0200
Subject: [PATCH] Changed utilities list and fix email test (refs #25522).
---
1.Base/1.Utilities/0_setup.py | 2 +-
tests/test_email.py | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/1.Base/1.Utilities/0_setup.py b/1.Base/1.Utilities/0_setup.py
index e8a49415..bdf169c9 100644
--- a/1.Base/1.Utilities/0_setup.py
+++ b/1.Base/1.Utilities/0_setup.py
@@ -8,7 +8,7 @@ def setup(interactive=True):
cmds = [
'apt-get clean',
'apt-get update',
- 'apt-get install --yes make ipython ipython3 vim netcat git htop iotop bmon host lm-sensors pciutils nfs-client smartmontools pwgen dialog curl python3-requests',
+ 'apt-get install --yes make ipython3 vim netcat git htop iotop bmon net-tools host lm-sensors pciutils nfs-client smartmontools pwgen curl python3-requests',
# Locale
'locale-gen en_GB.UTF-8',
'update-locale LANG=en_GB.UTF-8 LANGUAGE=en_GB.UTF-8 LC_ALL=en_GB.UTF-8 LC_MESSAGES=en_GB.UTF-8',
diff --git a/tests/test_email.py b/tests/test_email.py
index 09b0d7f0..a7b40089 100755
--- a/tests/test_email.py
+++ b/tests/test_email.py
@@ -14,8 +14,10 @@ import imp
try:
import spf
except ImportError:
- subprocess.call(['apt-get', '-qq', '-y', 'install', 'python3-spf'])
+ subprocess.check_call(['apt-get', '-qq', '-y', 'install', 'python3-spf'])
import spf
+if subprocess.call(['which', 'net-tools']) != 0:
+ subprocess.check_call(['apt-get', '-qq', '-y', 'install', 'net-tools'])
YELLOW = '\033[93m'
GREEN = '\033[92m'
--
GitLab