Skip to content

Commit 1962aee

Browse files
authored
Merge pull request #1366 from seleniumbase/reliability-and-dependencies
Reliability and dependencies
2 parents 4f41154 + c538c8a commit 1962aee

File tree

9 files changed

+28
-18
lines changed

9 files changed

+28
-18
lines changed

examples/custom_settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
# Default timeout values for waiting for page elements to appear.
77
MINI_TIMEOUT = 2
8-
SMALL_TIMEOUT = 6
8+
SMALL_TIMEOUT = 7
99
LARGE_TIMEOUT = 10
1010
EXTREME_TIMEOUT = 30
1111

examples/youtube_search_test.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
class YouTubeSearchTests(BaseCase):
55
def test_youtube_autocomplete_results(self):
66
"""Verify YouTube autocomplete search results."""
7+
if self.headless:
8+
self.open("about:blank")
9+
message = "This test is skipped in headless mode."
10+
print(message)
11+
self.skip(message)
712
self.open("https://www.youtube.com/c/MichaelMintz")
813
search_term = "seleniumbase"
914
search_selector = "input#search"

mkdocs_build/requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ joblib==1.1.0
1010
Markdown==3.3.7
1111
MarkupSafe==2.1.1
1212
pyparsing==3.0.9
13-
keyring==23.5.1
14-
pkginfo==1.8.2
13+
keyring==23.6.0
14+
pkginfo==1.8.3
1515
Jinja2==3.1.2
1616
click==8.1.3
1717
zipp==3.8.0
@@ -23,9 +23,9 @@ bleach==5.0.0
2323
jsmin==3.0.1
2424
lunr==0.6.2
2525
nltk==3.7
26-
watchdog==2.1.8
26+
watchdog==2.1.9
2727
mkdocs==1.3.0
28-
mkdocs-material==8.3.3
28+
mkdocs-material==8.3.5
2929
mkdocs-exclude-search==0.6.4
3030
mkdocs-simple-hooks==0.1.5
3131
mkdocs-material-extensions==1.0.3

requirements.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ packaging>=21.3;python_version>="3.6"
66
setuptools>=44.1.1;python_version<"3.5"
77
setuptools>=50.3.2;python_version>="3.5" and python_version<"3.6"
88
setuptools>=59.6.0;python_version>="3.6" and python_version<"3.7"
9-
setuptools>=62.3.3;python_version>="3.7"
9+
setuptools>=62.4.0;python_version>="3.7"
1010
setuptools-scm>=5.0.2;python_version<"3.6"
1111
setuptools-scm>=6.4.2;python_version>="3.6"
1212
tomli>=1.2.3;python_version>="3.6" and python_version<"3.7"
@@ -40,10 +40,12 @@ charset-normalizer==2.0.12;python_version>="3.5"
4040
urllib3==1.26.9
4141
requests==2.27.1;python_version<"3.5"
4242
requests==2.25.1;python_version>="3.5" and python_version<"3.6"
43-
requests==2.27.1;python_version>="3.6"
43+
requests==2.27.1;python_version>="3.6" and python_version<"3.7"
44+
requests==2.28.0;python_version>="3.7"
4445
nose==1.3.7
4546
sniffio==1.2.0;python_version>="3.7"
4647
h11==0.13.0;python_version>="3.7"
48+
outcome==1.2.0;python_version>="3.7"
4749
trio==0.21.0;python_version>="3.7"
4850
trio-websocket==0.9.2;python_version>="3.7"
4951
pyopenssl==22.0.0;python_version>="3.7"
@@ -132,7 +134,7 @@ tornado==6.1;python_version>="3.5"
132134
pdfminer.six==20191110;python_version<"3.5"
133135
pdfminer.six==20201018;python_version>="3.5" and python_version<"3.6"
134136
pdfminer.six==20211012;python_version>="3.6" and python_version<"3.7"
135-
pdfminer.six==20220319;python_version>="3.7"
137+
pdfminer.six==20220524;python_version>="3.7"
136138

137139
# --- Testing Requirements --- #
138140
# ("pip install -r requirements.txt" also installs this, but "pip install -e ." won't.)

seleniumbase/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# seleniumbase package
2-
__version__ = "3.2.9"
2+
__version__ = "3.2.10"

seleniumbase/config/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# Different methods/actions in base_case.py use different timeouts.
1313
# If the element to be acted on does not appear in time, the test fails.
1414
MINI_TIMEOUT = 2
15-
SMALL_TIMEOUT = 6
15+
SMALL_TIMEOUT = 7
1616
LARGE_TIMEOUT = 10
1717
EXTREME_TIMEOUT = 30
1818

seleniumbase/fixtures/base_case.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2584,8 +2584,8 @@ def switch_to_frame(self, frame, timeout=None):
25842584
"""
25852585
self.__check_scope()
25862586
if not timeout:
2587-
timeout = settings.SMALL_TIMEOUT
2588-
if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
2587+
timeout = settings.LARGE_TIMEOUT
2588+
if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
25892589
timeout = self.__get_new_timeout(timeout)
25902590
if type(frame) is str and self.is_element_visible(frame):
25912591
try:

seleniumbase/fixtures/js_utils.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ def raise_unable_to_load_jquery_exception(driver):
144144
)
145145
else:
146146
raise Exception(
147-
"""Unable to load jQuery on "%s" because this website """
148-
"""restricts external JavaScript resources from loading."""
147+
"""Unable to load jQuery on "%s" because this website may be """
148+
"""restricting external JavaScript resources from loading."""
149149
% driver.current_url
150150
)
151151

@@ -172,8 +172,9 @@ def activate_jquery(driver):
172172
time.sleep(0.1)
173173
try:
174174
add_js_link(driver, jquery_js)
175-
time.sleep(0.1)
175+
time.sleep(0.2)
176176
driver.execute_script("jQuery('head');")
177+
return
177178
except Exception:
178179
pass
179180
# Since jQuery still isn't activating, give up and raise an exception

setup.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
'setuptools>=44.1.1;python_version<"3.5"',
132132
'setuptools>=50.3.2;python_version>="3.5" and python_version<"3.6"',
133133
'setuptools>=59.6.0;python_version>="3.6" and python_version<"3.7"',
134-
'setuptools>=62.3.3;python_version>="3.7"',
134+
'setuptools>=62.4.0;python_version>="3.7"',
135135
'setuptools-scm>=5.0.2;python_version<"3.6"',
136136
'setuptools-scm>=6.4.2;python_version>="3.6"',
137137
'tomli>=1.2.3;python_version>="3.6" and python_version<"3.7"',
@@ -165,10 +165,12 @@
165165
"urllib3==1.26.9", # Must stay in sync with "requests"
166166
'requests==2.27.1;python_version<"3.5"',
167167
'requests==2.25.1;python_version>="3.5" and python_version<"3.6"',
168-
'requests==2.27.1;python_version>="3.6"',
168+
'requests==2.27.1;python_version>="3.6" and python_version<"3.7"',
169+
'requests==2.28.0;python_version>="3.7"',
169170
"nose==1.3.7",
170171
'sniffio==1.2.0;python_version>="3.7"',
171172
'h11==0.13.0;python_version>="3.7"',
173+
'outcome==1.2.0;python_version>="3.7"',
172174
'trio==0.21.0;python_version>="3.7"',
173175
'trio-websocket==0.9.2;python_version>="3.7"',
174176
'pyopenssl==22.0.0;python_version>="3.7"',
@@ -257,7 +259,7 @@
257259
'pdfminer.six==20191110;python_version<"3.5"',
258260
'pdfminer.six==20201018;python_version>="3.5" and python_version<"3.6"', # noqa: E501
259261
'pdfminer.six==20211012;python_version>="3.6" and python_version<"3.7"', # noqa: E501
260-
'pdfminer.six==20220319;python_version>="3.7"',
262+
'pdfminer.six==20220524;python_version>="3.7"',
261263
],
262264
extras_require={
263265
# pip install -e .[coverage]

0 commit comments

Comments
 (0)