From 2fe44e616e8bada830c920cc057286657dce89d0 Mon Sep 17 00:00:00 2001 From: Orlof Date: Tue, 16 Jun 2015 10:29:30 +0300 Subject: [PATCH] screenshots are overwritten only if filename is excplicitly given --- src/Selenium2Library/keywords/_screenshot.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/Selenium2Library/keywords/_screenshot.py b/src/Selenium2Library/keywords/_screenshot.py index 74488f864..f974d67b4 100644 --- a/src/Selenium2Library/keywords/_screenshot.py +++ b/src/Selenium2Library/keywords/_screenshot.py @@ -50,12 +50,19 @@ def capture_page_screenshot(self, filename=None): # Private def _get_screenshot_paths(self, filename): + logdir = self._get_log_dir() + if not filename: - self._screenshot_index += 1 - filename = 'selenium-screenshot-%d.png' % self._screenshot_index + while True: + # if filename is not specified, don't overwrite images + self._screenshot_index += 1 + filename = 'selenium-screenshot-%d.png' % self._screenshot_index + path = os.path.join(logdir, filename) + if not os.path.exists(path): + break else: filename = filename.replace('/', os.sep) - logdir = self._get_log_dir() - path = os.path.join(logdir, filename) + path = os.path.join(logdir, filename) + link = robot.utils.get_link_path(path, logdir) return path, link