From 68f6b9f6f6e784781a46d5928078203d6fd678d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauri=20V=C3=B5sandi?= Date: Thu, 4 May 2017 06:55:26 +0000 Subject: [PATCH] tests: Attempt to install NetworkManager --- .travis.yml | 2 +- certidude/cli.py | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 22ad888..71f04be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ script: - sudo useradd adminbot -G sudo -p '$1$PBkf5waA$n9EV6WJ7PS6lyGWkgeTPf1' - sudo useradd userbot -G users -p '$1$PBkf5waA$n9EV6WJ7PS6lyGWkgeTPf1' - sudo chmod 777 . # Allow forked processes to write .coverage files - - sudo mkdir /etc/NetworkManager/system-connections/ # Allow config file creation without having NM installed + - sudo mkdir -p /etc/NetworkManager/system-connections/ # Allow config file creation without having NM installed - sudo coverage run --parallel-mode --source certidude -m py.test tests - sudo coverage combine - sudo coverage report diff --git a/certidude/cli.py b/certidude/cli.py index b9d6f4f..bb1dcfe 100755 --- a/certidude/cli.py +++ b/certidude/cli.py @@ -657,12 +657,11 @@ def certidude_setup_strongswan_client(authority, remote, common_name, **paths): @setup_client() def certidude_setup_strongswan_networkmanager(authority, remote, common_name, **paths): # Install dependencies - apt("strongswan-nm") - rpm("NetworkManager-strongswan-gnome") - - endpoint = "IPSec to %s" % remote + apt("network-manager strongswan-nm") + rpm("NetworkManager NetworkManager-tui NetworkManager-strongswan-gnome") # Create corresponding section in /etc/certidude/services.conf + endpoint = "IPSec to %s" % remote service_config = ConfigParser() if os.path.exists(const.SERVICES_CONFIG_PATH): service_config.readfp(open(const.SERVICES_CONFIG_PATH)) @@ -685,6 +684,9 @@ def certidude_setup_strongswan_networkmanager(authority, remote, common_name, ** @click.option("--common-name", "-cn", default=const.HOSTNAME, help="Common name, %s by default" % const.HOSTNAME) @setup_client() def certidude_setup_openvpn_networkmanager(authority, remote, common_name, **paths): + apt("network-manager network-manager-openvpn-gnome") + rpm("NetworkManager NetworkManager-tui NetworkManager-openvpn-gnome") + # Create corresponding section in /etc/certidude/services.conf endpoint = "OpenVPN to %s" % remote