From 22ad235cd12b2498aa86395d2805e760d79c655e Mon Sep 17 00:00:00 2001
From: Miguel Nogueira <miguel456@spacejewel-hosting.com>
Date: Wed, 12 Jun 2019 14:48:18 +0100
Subject: [PATCH] Tweak expectations

---
 .idea/workspace.xml | 18 +++++++-----------
 pyvpn               |  8 +++-----
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index caab9fc..94ccdf2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,12 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="e692128d-c507-4123-b92b-96e6e5af92d3" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/PythonVPNGateway.iml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pyVPN.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pyvpn" beforeDir="false" afterPath="$PROJECT_DIR$/pyvpn" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -33,8 +28,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/pyvpn">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="360">
-              <caret line="28" column="39" selection-start-line="28" selection-start-column="39" selection-end-line="28" selection-end-column="39" />
+            <state relative-caret-position="255">
+              <caret line="26" column="25" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" />
             </state>
           </provider>
         </entry>
@@ -143,13 +138,14 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1920" height="1037" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info id="Favorites" side_tool="true" />
       <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18133895" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="bottom" id="Version Control" />
       <window_info anchor="bottom" id="Python Console" weight="0.32963374" />
-      <window_info active="true" anchor="bottom" id="Terminal" visible="true" weight="0.32852387" />
+      <window_info anchor="bottom" id="Terminal" weight="0.32852387" />
       <window_info anchor="bottom" id="Event Log" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
@@ -231,8 +227,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/pyvpn">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="28" column="39" selection-start-line="28" selection-start-column="39" selection-end-line="28" selection-end-column="39" />
+        <state relative-caret-position="255">
+          <caret line="26" column="25" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" />
         </state>
       </provider>
     </entry>
diff --git a/pyvpn b/pyvpn
index 29158c9..8cd426f 100755
--- a/pyvpn
+++ b/pyvpn
@@ -24,13 +24,11 @@ if len(sys.argv) > 2:
 
         configFilePath = operatingDir + "/" + clientName + ".ovpn"
 
-        fScript.expect("[1-4]:")
-
+        fScript.expect(".*[1-4]:")
         fScript.sendline("1")
-
-        fScript.expect("Client name: ")
-
+        fScript.expect(".*name:")
         fScript.sendline(clientName)
+        fScript.expect(".*")
 
         fScript.kill(0)