From 5b353bdea28bd87d9ed8d77673a18d0ad2cfbc87 Mon Sep 17 00:00:00 2001
From: Marius <24592972+gilbN@users.noreply.github.com>
Date: Mon, 6 Jun 2022 23:57:30 +0200
Subject: [PATCH] moved test_container_delay, better log msg

---
 README.md |  2 +-
 ci/ci.py  | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index f86ba34..6c30607 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ sudo docker run --rm -i \
 -e S3_BUCKET=<optional, custom S3 Bucket> \
 -e WEB_SCREENSHOT=<optional, set to false if not a web app> \
 -e WEB_SCREENSHOT_DELAY=<optional, time in seconds to delay before taking screenshot>
--e DELAY_START=<optional, time in seconds to delay before starting tester container> \
+-e DELAY_START=<optional, time in seconds to delay before reloading tester and -e IMAGE container> \
 -e PORT=<optional, port web application listens on internal docker port> \
 -e SSL=<optional , use ssl for the screenshot true/false> \
 -t lsiodev/ci:latest \
diff --git a/ci/ci.py b/ci/ci.py
index be19483..bf30a9f 100755
--- a/ci/ci.py
+++ b/ci/ci.py
@@ -290,19 +290,20 @@ class CI():
     def take_screenshot(self, container, tag):
         '''Take a screenshot and save it to self.outdir'''
         proto = 'https' if self.ssl.upper() == 'TRUE' else 'http'
+        # Sleep for the user specified amount of time
+        self.logger.info('Sleeping for %s seconds before reloading container: %s and refreshing container attrs', self.test_container_delay, container.image)
+        time.sleep(int(self.test_container_delay))
         container.reload()
         ip = container.attrs['NetworkSettings']['Networks']['bridge']['IPAddress']
         endpoint = f'{proto}://{self.webauth}@{ip}:{self.port}{self.webpath}'
-        # Sleep for the user specified amount of time
-        self.logger.info('Sleeping for %s seconds', self.test_container_delay)
-        time.sleep(int(self.test_container_delay))
         self.logger.info("Starting tester container")
         testercontainer = self.client.containers.run('lsiodev/tester:latest',
                                                      shm_size='1G',
                                                      detach=True,
                                                      environment={'URL': endpoint})
-        self.logger.info('Sleeping for %s seconds before starting Chromedriver', self.screenshot_delay)
-        time.sleep(int(self.screenshot_delay))
+        # Sleep for the user specified amount of time
+        self.logger.info('Sleeping for %s seconds before reloading %s and refreshing container attrs', self.screenshot_delay, testercontainer.image)
+        time.sleep(int(self.test_container_delay))
         testercontainer.reload()
         testerip = testercontainer.attrs['NetworkSettings']['Networks']['bridge']['IPAddress']
         testerendpoint = 'http://' + testerip + ':3000'