Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pyodide
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
pyodide
Commits
9245f6f2
Commit
9245f6f2
authored
Aug 20, 2018
by
Roman Yurchak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More generic selenium fixture caching mechanism
parent
6b51f3a2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
12 deletions
+37
-12
test/conftest.py
test/conftest.py
+26
-2
test/test_common.py
test/test_common.py
+8
-7
test/test_python.py
test/test_python.py
+3
-3
No files found.
test/conftest.py
View file @
9245f6f2
...
...
@@ -103,8 +103,8 @@ class ChromeWrapper(SeleniumWrapper):
if
pytest
is
not
None
:
@
pytest
.
fixture
(
params
=
[
'firefox'
,
'chrome'
]
,
scope
=
'module'
)
def
selenium
(
request
):
@
pytest
.
fixture
(
params
=
[
'firefox'
,
'chrome'
])
def
selenium
_standalone
(
request
):
if
request
.
param
==
'firefox'
:
cls
=
FirefoxWrapper
elif
request
.
param
==
'chrome'
:
...
...
@@ -116,6 +116,30 @@ if pytest is not None:
print
(
'
\
n
'
.
join
(
str
(
x
)
for
x
in
selenium
.
logs
))
selenium
.
driver
.
quit
()
@
pytest
.
fixture
(
params
=
[
'firefox'
,
'chrome'
],
scope
=
'module'
)
def
_selenium_cached
(
request
):
# intermediary cached selenium instance, this is a copy
# of the selenium_standalone to avoid fixture scope issues
if
request
.
param
==
'firefox'
:
cls
=
FirefoxWrapper
elif
request
.
param
==
'chrome'
:
cls
=
ChromeWrapper
selenium
=
cls
()
try
:
yield
selenium
finally
:
selenium
.
driver
.
quit
()
@
pytest
.
fixture
def
selenium
(
_selenium_cached
):
# this is selenium instance cached at the module level
try
:
# for each test run, we clean selenium logs
_selenium_cached
.
driver
.
execute_script
(
"window.logs = []"
)
yield
_selenium_cached
finally
:
print
(
'
\
n
'
.
join
(
str
(
x
)
for
x
in
_selenium_cached
.
logs
))
PORT
=
0
...
...
test/test_common.py
View file @
9245f6f2
...
...
@@ -32,16 +32,17 @@ UNSUPPORTED_PACKAGES = {'ChromeWrapper': ['pandas'],
@
pytest
.
mark
.
parametrize
(
'name'
,
registered_packages
())
def
test_import
(
name
,
selenium
):
def
test_import
(
name
,
selenium
_standalone
):
# check that we can parse the meta.yaml
meta
=
common
.
parse_package
(
PKG_DIR
/
name
/
'meta.yaml'
)
if
name
in
UNSUPPORTED_PACKAGES
[
selenium
.
__class__
.
__name__
]:
if
name
in
UNSUPPORTED_PACKAGES
[
selenium
_standalone
.
__class__
.
__name__
]:
pytest
.
xfail
(
'{} fails to load and is not supported on {}.'
.
format
(
name
,
selenium
.
__class__
.
__name__
.
replace
(
'Wrapper'
,
''
)))
selenium_standalone
.
__class__
.
__name__
.
replace
(
'Wrapper'
,
''
)))
for
import_name
in
meta
.
get
(
'test'
,
{}).
get
(
'imports'
,
[]):
selenium
.
load_package
(
name
)
selenium
.
run
(
'import %s'
%
import_name
)
selenium
_standalone
.
load_package
(
name
)
selenium
_standalone
.
run
(
'import %s'
%
import_name
)
test/test_python.py
View file @
9245f6f2
...
...
@@ -6,9 +6,9 @@ import time
import
pytest
def
test_init
(
selenium
):
assert
'Python initialization complete'
in
selenium
.
logs
assert
len
(
selenium
.
driver
.
window_handles
)
==
1
def
test_init
(
selenium
_standalone
):
assert
'Python initialization complete'
in
selenium
_standalone
.
logs
assert
len
(
selenium
_standalone
.
driver
.
window_handles
)
==
1
def
test_webbrowser
(
selenium
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment