Skip to content

Commit afdd7d4

Browse files
committed
swap to taking a screenshot of a testing container instead of directly hitting the container
1 parent a03d1f4 commit afdd7d4

1 file changed

Lines changed: 15 additions & 7 deletions

File tree

ci/ci.py

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,14 @@ def endtest(container,report_tests,report_containers,report_status,tag,build_ver
231231
ip = container.attrs["NetworkSettings"]["Networks"]["bridge"]["IPAddress"]
232232
endpoint = proto + webauth + '@' + ip + ':' + port + webpath
233233
print('Taking screenshot of ' + tag + ' at ' + endpoint)
234+
testercontainer = client.containers.run('lsiodev/tester:latest',
235+
shm_size='1G',
236+
detach=True,
237+
environment={'URL': endpoint})
238+
time.sleep(30)
239+
testercontainer.reload()
240+
testerip = testercontainer.attrs["NetworkSettings"]["Networks"]["bridge"]["IPAddress"]
241+
testerendpoint = "http://" + testerip + ":3000"
234242
try:
235243
# Selenium webdriver options
236244
chrome_options = webdriver.ChromeOptions()
@@ -240,13 +248,12 @@ def endtest(container,report_tests,report_containers,report_status,tag,build_ver
240248
chrome_options.add_argument('--window-size=1920x1080')
241249
driver = webdriver.Chrome(options=chrome_options)
242250
driver.set_page_load_timeout(60)
243-
if proto == "http://":
244-
session = requests.Session()
245-
retries = Retry(total=4, backoff_factor=2, status_forcelist=[ 502, 503, 504 ])
246-
session.mount(proto, HTTPAdapter(max_retries=retries))
247-
session.get(endpoint)
248-
driver.get(endpoint)
249-
time.sleep(10)
251+
session = requests.Session()
252+
retries = Retry(total=4, backoff_factor=2, status_forcelist=[ 502, 503, 504 ])
253+
session.mount(proto, HTTPAdapter(max_retries=retries))
254+
session.get(testerendpoint)
255+
driver.get(testerendpoint)
256+
time.sleep(15)
250257
driver.get_screenshot_as_file(outdir + tag + '.png')
251258
report_tests.append(['Screenshot ' + tag,'PASS'])
252259
# Quit selenium webdriver
@@ -260,6 +267,7 @@ def endtest(container,report_tests,report_containers,report_status,tag,build_ver
260267
except WebDriverException as error:
261268
report_tests.append(['Screenshot ' + tag,'FAIL UNKNOWN'])
262269
# If all info is present end test
270+
testercontainer.remove(force='true')
263271
(report_tests,report_containers,report_status) = endtest(container,report_tests,report_containers,report_status,tag,build_version,packages)
264272
return (report_tests,report_containers,report_status)
265273

0 commit comments

Comments
 (0)