From 54a985cb11861f3857daa7001558f015d971dc3d Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Wed, 23 Jan 2019 01:02:42 +0100
Subject: Simplify code that checks if a VPN is running

---
 test/segments/public_ip.spec | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/segments/public_ip.spec b/test/segments/public_ip.spec
index eeb50596..8e44d0e1 100755
--- a/test/segments/public_ip.spec
+++ b/test/segments/public_ip.spec
@@ -36,13 +36,15 @@ function tearDown() {
 }
 
 function fakeIfconfig() {
+  local INTERFACE="${1}"
+  [[ -z "${INTERFACE}" ]] && INTERFACE="tun0"
     # Fake ifconfig
   cat > $FOLDER/sbin/ifconfig <<EOF
 #!/usr/bin/env zsh
 
 if [[ "\$#" -gt 0 ]]; then
   cat <<INNER
-tun1: flags=4099<UP,BROADCAST,MULTICAST>  mtu 1500
+${INTERFACE}: flags=4099<UP,BROADCAST,MULTICAST>  mtu 1500
         inet 1.2.3.4  txqueuelen 1000  (Ethernet)
         RX packets 0  bytes 0 (0.0 B)
         RX errors 0  dropped 0  overruns 0  frame 0
@@ -62,7 +64,7 @@ docker0: flags=4099<UP,BROADCAST,MULTICAST>  mtu 1500
         TX packets 0  bytes 0 (0.0 B)
         TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0
 
-tun1: flags=4099<UP,BROADCAST,MULTICAST>  mtu 1500
+${INTERFACE}: flags=4099<UP,BROADCAST,MULTICAST>  mtu 1500
         inet 1.2.3.4  txqueuelen 1000  (Ethernet)
         RX packets 0  bytes 0 (0.0 B)
         RX errors 0  dropped 0  overruns 0  frame 0
@@ -337,7 +339,7 @@ function testPublicIpSegmentWithVPNTurnedOnOsx() {
   }
 
   # Fake ifconfig
-  fakeIfconfig
+  fakeIfconfig "tun1"
 
   assertEquals "%K{000} %F{007}(vpn) %f%F{007}1.2.3.4 " "$(prompt_public_ip left 1 false "$FOLDER")"
 
-- 
cgit v1.2.3