diff --git a/scripts/install_package.cmd b/scripts/install_package.cmd index 8caa3d5fd..fc79b80de 100644 --- a/scripts/install_package.cmd +++ b/scripts/install_package.cmd @@ -13,5 +13,5 @@ taskkill /f /im chromedriver.exe echo ------------------------- echo Installing project... echo ------------------------- -pip install -U dist/tir_framework-1.20.16rc3.tar.gz +pip install -U dist/tir_framework-1.20.16rc4.tar.gz pause >nul | set/p = Press any key to exit ... diff --git a/tir/technologies/core/base.py b/tir/technologies/core/base.py index 8778d78c8..38f822612 100644 --- a/tir/technologies/core/base.py +++ b/tir/technologies/core/base.py @@ -1170,15 +1170,17 @@ def get_url(self, url=None): url = self.config.url if not url else url - endtime = time.time() + self.config.time_out - while (time.time() < endtime and not get_url): - - logger().debug('Get URL') + num_of_trying = 1 + while not get_url and num_of_trying <= 5: + self.driver.get(url) try: - self.driver.get(url) + WebDriverWait(self.driver, int(self.config.time_out / num_of_trying)).until(EC.presence_of_element_located((By.ID, 'fieldsetStartProg'))) + logger().info("Page is ready!") get_url = True + break except: - get_url = False + num_of_trying += 1 + logger().info(f"Loading took too much time! num_of_trying: {str(num_of_trying)}") def TearDown(self): """ diff --git a/tir/technologies/webapp_internal.py b/tir/technologies/webapp_internal.py index faba04ae9..20e9d6a32 100644 --- a/tir/technologies/webapp_internal.py +++ b/tir/technologies/webapp_internal.py @@ -6246,8 +6246,10 @@ def fill_grid(self, field, x3_dictionaries, initial_layer, duplicate_fields=[]): else: try_counter = 0 + modal_open = self.wait_element_timeout(term='wa-dialog', scrap_type=enum.ScrapType.CSS_SELECTOR, position= tmodal_layer + 1, timeout=10, presence=True, main_container='body', check_error=False) + if (("_" in field[0] and field_to_len != {} and int(field_to_len[field[0]]) > len( - field[1])) or lenfield > len(field[1])): + field[1])) or lenfield > len(field[1])) and modal_open: if (("_" in field[0] and field_to_valtype != {} and field_to_valtype[ field[0]] != "N") or valtype != "N"): self.send_keys(selenium_input(), Keys.ENTER) diff --git a/tir/version.py b/tir/version.py index 39a7f8369..0e83f1110 100644 --- a/tir/version.py +++ b/tir/version.py @@ -1 +1 @@ -__version__ = '1.20.16rc3' +__version__ = '1.20.16rc4'