Skip to content

Commit 162ce06

Browse files
authored
Merge pull request #243 from seleniumbase/fix-edge-case-with-teardown-method
Fix edge case with BaseCase tearDown() method
2 parents e08480d + e5e0a39 commit 162ce06

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ unittest2
99
selenium==3.141.0
1010
requests==2.20.0
1111
urllib3==1.24.1
12-
pytest>=3.10.0
12+
pytest>=4.0.0
1313
pytest-cov>=2.6.0
1414
pytest-html>=1.19.0
15-
pytest-rerunfailures>=4.2
16-
pytest-xdist>=1.24.0
15+
pytest-rerunfailures>=5.0
16+
pytest-xdist>=1.24.1
1717
parameterized==0.6.1
1818
beautifulsoup4>=4.6.0
1919
pyotp>=2.2.7

seleniumbase/fixtures/base_case.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2734,7 +2734,7 @@ def tearDown(self):
27342734
"""
27352735
has_exception = False
27362736
if sys.version.startswith('3') and hasattr(self, '_outcome'):
2737-
if self._outcome.errors:
2737+
if hasattr(self._outcome, 'errors') and self._outcome.errors:
27382738
has_exception = True
27392739
else:
27402740
has_exception = sys.exc_info()[1] is not None

setup.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
setup(
1919
name='seleniumbase',
20-
version='1.17.3',
20+
version='1.17.4',
2121
description='All-in-One Test Automation Framework',
2222
long_description=long_description,
2323
long_description_content_type='text/markdown',
@@ -61,11 +61,11 @@
6161
'selenium==3.141.0',
6262
'requests==2.20.0', # Changing this may effect "urllib3"
6363
'urllib3==1.24.1', # Keep this lib in sync with "requests"
64-
'pytest>=3.10.0',
64+
'pytest>=4.0.0',
6565
'pytest-cov>=2.6.0',
6666
'pytest-html>=1.19.0',
67-
'pytest-rerunfailures>=4.2',
68-
'pytest-xdist>=1.24.0',
67+
'pytest-rerunfailures>=5.0',
68+
'pytest-xdist>=1.24.1',
6969
'parameterized==0.6.1',
7070
'beautifulsoup4>=4.6.0', # Keep at >=4.6.0 while using bs4
7171
'pyotp>=2.2.7',

0 commit comments

Comments
 (0)