From f9f68817ba40c0ddbb14c00176e03032c804d8c4 Mon Sep 17 00:00:00 2001 From: Nico Schedel Date: Tue, 17 Aug 2021 12:13:43 +0200 Subject: [PATCH] TT#70901 selenium: choose call forwarding date more carefully Previously when adding condition (date is) to a call forwarding, it was hardcoded to be the 15th of every month. However this caused tests to fail on this exact day every month. Now beeing more careful with date choosing. Change-Id: I3e49f02230d5e6390f484e7d3864747c3437ecdf --- t/selenium/testrun.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/t/selenium/testrun.py b/t/selenium/testrun.py index f13d416b..15d55654 100644 --- a/t/selenium/testrun.py +++ b/t/selenium/testrun.py @@ -196,17 +196,22 @@ class testrun(unittest.TestCase): "Second condition was not deleted") print("OK") print("Try to add second condition 'date is...'...", end="") + day = datetime.today().day + if day >= 28: + day -= 1 + elif day < 28: + day += 1 driver.find_element_by_xpath('//*[@id="csc-wrapper-call-forwarding"]//div/span[contains(., "condition")]').click() driver.find_element_by_xpath('/html/body/div[3]/div/div[2]/div/div[3]/div[3]').click() - driver.find_element_by_xpath('/html/body//div/button[contains(., 15)]').click() + driver.find_element_by_xpath('/html/body//div/button[contains(., ' + str(day) + ')]').click() driver.find_element_by_xpath('/html/body//div//button[contains(., "Save")]').click() wait_for_invisibility(driver, '//*[@id="csc-wrapper-call-forwarding"]/div/div[2]/div[4]/svg') self.assertTrue( - len(driver.find_elements_by_xpath('//*[@id="csc-wrapper-call-forwarding"]//div/span[contains(., "' + datetime.today().strftime('%Y/%m') + '/15' + '")]')) > 0, + len(driver.find_elements_by_xpath('//*[@id="csc-wrapper-call-forwarding"]//div/span[contains(., "' + datetime.today().strftime('%Y/%m/') + str(day) + '")]')) > 0, "'Office hours are...' condition is not correct") print("OK") print("Try to delete second condition...", end="") - driver.find_element_by_xpath('//*[@id="csc-wrapper-call-forwarding"]//div/span[contains(., "' + datetime.today().strftime('%Y/%m') + '/15' + '")]').click() + driver.find_element_by_xpath('//*[@id="csc-wrapper-call-forwarding"]//div/span[contains(., "' + datetime.today().strftime('%Y/%m/') + str(day) + '")]').click() driver.find_element_by_xpath('/html/body//div//button[contains(., "Delete")]').click() wait_for_invisibility(driver, '//*[@id="csc-wrapper-call-forwarding"]/div/div[2]/div[4]/svg') self.assertTrue(