Skip to content

Commit 07d3c24

Browse files
Timeout based on time rather than number of retries for Python (#174)
1 parent 0f32138 commit 07d3c24

File tree

6 files changed

+31
-19
lines changed

6 files changed

+31
-19
lines changed

python/bottle/containerWithTests/Tests/functional_tests/test_functional.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,17 @@ def setUp(self):
1616

1717
def test_selenium(self):
1818
webAppUrl = pytest.config.getoption('webAppUrl')
19-
num_retries = 5
20-
for i in range(num_retries):
19+
start_timestamp = time.time()
20+
end_timestamp = start_timestamp + 60*10
21+
while True:
2122
try:
2223
response = self.driver.get(webAppUrl)
2324
title = self.driver.title
2425
self.assertIn("Home Page - Python Bottle Application", title)
2526
break
2627
except AssertionError:
27-
if(i == (num_retries - 1)):
28+
current_timestamp = time.time()
29+
if(currrent_timestamp > end_timestamp):
2830
raise
2931
time.sleep(5)
3032
except Exception as e:

python/bottle/webappWithTests/Tests/functional_tests/test_functional.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,17 @@ def setUp(self):
1616

1717
def test_selenium(self):
1818
webAppUrl = pytest.config.getoption('webAppUrl')
19-
num_retries = 5
20-
for i in range(num_retries):
19+
start_timestamp = time.time()
20+
end_timestamp = start_timestamp + 60*10
21+
while True:
2122
try:
2223
response = self.driver.get(webAppUrl)
2324
title = self.driver.title
2425
self.assertIn("Home Page - Python Bottle Application", title)
2526
break
2627
except AssertionError:
27-
if(i == (num_retries - 1)):
28+
current_timestamp = time.time()
29+
if(currrent_timestamp > end_timestamp):
2830
raise
2931
time.sleep(5)
3032
except Exception as e:

python/django/containerWithTests/Tests/functional_tests/test_functional.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,17 @@ def setUp(self):
1616

1717
def test_selenium(self):
1818
webAppUrl = pytest.config.getoption('webAppUrl')
19-
num_retries = 5
20-
for i in range(num_retries):
19+
start_timestamp = time.time()
20+
end_timestamp = start_timestamp + 60*10
21+
while True:
2122
try:
2223
response = self.driver.get(webAppUrl)
2324
title = self.driver.title
2425
self.assertIn("Home Page - Python Django Application", title)
2526
break
2627
except AssertionError:
27-
if(i == (num_retries - 1)):
28+
current_timestamp = time.time()
29+
if(currrent_timestamp > end_timestamp):
2830
raise
2931
time.sleep(5)
3032
except Exception as e:

python/django/webappWithTests/Tests/functional_tests/test_functional.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,17 @@ def setUp(self):
1616

1717
def test_selenium(self):
1818
webAppUrl = pytest.config.getoption('webAppUrl')
19-
num_retries = 5
20-
for i in range(num_retries):
19+
start_timestamp = time.time()
20+
end_timestamp = start_timestamp + 60*10
21+
while True:
2122
try:
2223
response = self.driver.get(webAppUrl)
2324
title = self.driver.title
2425
self.assertIn("Home Page - Python Django Application", title)
2526
break
2627
except AssertionError:
27-
if(i == (num_retries - 1)):
28+
current_timestamp = time.time()
29+
if(currrent_timestamp > end_timestamp):
2830
raise
2931
time.sleep(5)
3032
except Exception as e:

python/flask/containerWithTests/Tests/functional_tests/test_functional.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,17 @@ def setUp(self):
1616

1717
def test_selenium(self):
1818
webAppUrl = pytest.config.getoption('webAppUrl')
19-
num_retries = 5
20-
for i in range(num_retries):
19+
start_timestamp = time.time()
20+
end_timestamp = start_timestamp + 60*10
21+
while True:
2122
try:
2223
response = self.driver.get(webAppUrl)
2324
title = self.driver.title
2425
self.assertIn("Home Page - Python Flask Application", title)
2526
break
2627
except AssertionError:
27-
if(i == (num_retries - 1)):
28+
current_timestamp = time.time()
29+
if(currrent_timestamp > end_timestamp):
2830
raise
2931
time.sleep(5)
3032
except Exception as e:
@@ -34,4 +36,4 @@ def tearDown(self):
3436
try:
3537
self.driver.quit()
3638
except Exception as e:
37-
print('tearDown.Error occurred while trying to close the selenium chrome driver: ' + str(e))
39+
print('tearDown.Error occurred while trying to close the selenium chrome driver: ' + str(e))

python/flask/webappWithTests/Tests/functional_tests/test_functional.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,17 @@ def setUp(self):
1616

1717
def test_selenium(self):
1818
webAppUrl = pytest.config.getoption('webAppUrl')
19-
num_retries = 5
20-
for i in range(num_retries):
19+
start_timestamp = time.time()
20+
end_timestamp = start_timestamp + 60*10
21+
while True:
2122
try:
2223
response = self.driver.get(webAppUrl)
2324
title = self.driver.title
2425
self.assertIn("Home Page - Python Flask Application", title)
2526
break
2627
except AssertionError:
27-
if(i == (num_retries - 1)):
28+
current_timestamp = time.time()
29+
if(currrent_timestamp > end_timestamp):
2830
raise
2931
time.sleep(5)
3032
except Exception as e:

0 commit comments

Comments
 (0)