Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/v1.20.16rc4 #1364

Merged
merged 5 commits into from
Dec 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/install_package.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -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 ...
14 changes: 8 additions & 6 deletions tir/technologies/core/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
"""
Expand Down
4 changes: 3 additions & 1 deletion tir/technologies/webapp_internal.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tir/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.20.16rc3'
__version__ = '1.20.16rc4'