From 976cb5505ed7ba3f54dfcb662a6826a89e91530d Mon Sep 17 00:00:00 2001
From: Logan Lipke <lolipke@gmail.com>
Date: Fri, 31 Jul 2020 10:30:44 -0700
Subject: [PATCH] Added check with wait_for_ips that will stop the test if a
 timeout occurs

---
 py-scripts/test_generic.py              |  6 +++++-
 py-scripts/test_ipv4_l4.py              |  6 +++++-
 py-scripts/test_ipv4_l4_urls_per_ten.py | 10 +++++++---
 py-scripts/test_ipv4_variable_time.py   |  6 +++++-
 py-scripts/test_ipv6_variable_time.py   |  6 +++++-
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/py-scripts/test_generic.py b/py-scripts/test_generic.py
index 45d86c1f..06fc550a 100755
--- a/py-scripts/test_generic.py
+++ b/py-scripts/test_generic.py
@@ -55,7 +55,11 @@ class GenTest(LFCliBase):
         self.station_profile.admin_up(self.resource)
         temp_stas = self.sta_list.copy()
         temp_stas.append("eth1")
-        self.local_realm.wait_for_ip(self.resource, temp_stas)
+        if self.local_realm.wait_for_ip(self.resource, temp_stas):
+            self._pass("All stations got IPs", print_pass)
+        else:
+            self._fail("Stations failed to get IPs", print_fail)
+            exit(1)
         cur_time = datetime.datetime.now()
         passes = 0
         expected_passes = 0
diff --git a/py-scripts/test_ipv4_l4.py b/py-scripts/test_ipv4_l4.py
index aa43a114..d3b55e13 100755
--- a/py-scripts/test_ipv4_l4.py
+++ b/py-scripts/test_ipv4_l4.py
@@ -101,7 +101,11 @@ class IPV4L4(LFCliBase):
     def start(self, print_pass=False, print_fail=False):
         temp_stas = self.sta_list.copy()
         temp_stas.append("eth1")
-        self.local_realm.wait_for_ip(self.resource, temp_stas)
+        if self.local_realm.wait_for_ip(self.resource, temp_stas):
+            self._pass("All stations got IPs", print_pass)
+        else:
+            self._fail("Stations failed to get IPs", print_fail)
+            exit(1)
         cur_time = datetime.datetime.now()
         old_rx_values = self.__get_values()
         end_time = self.local_realm.parse_time(self.test_duration) + cur_time
diff --git a/py-scripts/test_ipv4_l4_urls_per_ten.py b/py-scripts/test_ipv4_l4_urls_per_ten.py
index f80fbd45..f255d2bd 100755
--- a/py-scripts/test_ipv4_l4_urls_per_ten.py
+++ b/py-scripts/test_ipv4_l4_urls_per_ten.py
@@ -86,11 +86,15 @@ class IPV4L4(LFCliBase):
         temp_stas = self.sta_list.copy()
         temp_stas.append("eth1")
         cur_time = datetime.datetime.now()
-        interval_time = cur_time + datetime.timedelta(minutes=2)
+        interval_time = cur_time + datetime.timedelta(minutes=10)
         passes = 0
         expected_passes = 0
         self.station_profile.admin_up(1)
-        self.local_realm.wait_for_ip(self.resource, temp_stas)
+        if self.local_realm.wait_for_ip(self.resource, temp_stas):
+            self._pass("All stations got IPs", print_pass)
+        else:
+            self._fail("Stations failed to get IPs", print_fail)
+            exit(1)
         self.cx_profile.start_cx()
         print("Starting test")
         for test in range(self.num_tests):
@@ -108,7 +112,7 @@ class IPV4L4(LFCliBase):
             else:
                 self._fail("FAIL: Errors found getting to %s " % self.url, print_fail)
                 break
-            interval_time = cur_time + datetime.timedelta(minutes=2)
+            interval_time = cur_time + datetime.timedelta(minutes=10)
         if passes == expected_passes:
             self._pass("PASS: All tests passes", print_pass)
 
diff --git a/py-scripts/test_ipv4_variable_time.py b/py-scripts/test_ipv4_variable_time.py
index a193f66e..90acad72 100755
--- a/py-scripts/test_ipv4_variable_time.py
+++ b/py-scripts/test_ipv4_variable_time.py
@@ -92,7 +92,11 @@ class IPV4VariableTime(LFCliBase):
         self.station_profile.admin_up(self.resource)
         temp_stas = self.sta_list.copy()
         temp_stas.append("eth1")
-        self.local_realm.wait_for_ip(self.resource, temp_stas)
+        if self.local_realm.wait_for_ip(self.resource, temp_stas):
+            self._pass("All stations got IPs", print_pass)
+        else:
+            self._fail("Stations failed to get IPs", print_fail)
+            exit(1)
         cur_time = datetime.datetime.now()
         old_cx_rx_values = self.__get_rx_values()
         end_time = self.local_realm.parse_time(self.test_duration) + cur_time
diff --git a/py-scripts/test_ipv6_variable_time.py b/py-scripts/test_ipv6_variable_time.py
index 9e8540a7..ae33c935 100755
--- a/py-scripts/test_ipv6_variable_time.py
+++ b/py-scripts/test_ipv6_variable_time.py
@@ -93,7 +93,11 @@ class IPV6VariableTime(LFCliBase):
         self.station_profile.admin_up(self.resource)
         temp_stas = self.sta_list.copy()
         temp_stas.append("eth1")
-        self.local_realm.wait_for_ip(self.resource, temp_stas, ipv6=True)
+        if self.local_realm.wait_for_ip(self.resource, temp_stas, ipv6=True):
+            self._pass("All stations got IPs", print_pass)
+        else:
+            self._fail("Stations failed to get IPs", print_fail, ipv6=True)
+            exit(1)
         cur_time = datetime.datetime.now()
         old_cx_rx_values = self.__get_rx_values()
         end_time = self.local_realm.parse_time(self.test_duration) + cur_time