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
bfd0e586
Commit
bfd0e586
authored
Aug 28, 2018
by
Roman Yurchak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Address review comments
parent
46c2aa9b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
12 deletions
+9
-12
Makefile
Makefile
+7
-1
test/conftest.py
test/conftest.py
+2
-11
No files found.
Makefile
View file @
bfd0e586
...
@@ -49,7 +49,9 @@ all: build/pyodide.asm.js \
...
@@ -49,7 +49,9 @@ all: build/pyodide.asm.js \
build/matplotlib-sideload.html
\
build/matplotlib-sideload.html
\
build/renderedhtml.css
\
build/renderedhtml.css
\
build/test.data
\
build/test.data
\
build/packages.json
build/packages.json
\
build/test_data.txt
\
build/test.html
build/pyodide.asm.js
:
src/main.bc src/jsimport.bc src/jsproxy.bc src/js2python.bc
\
build/pyodide.asm.js
:
src/main.bc src/jsimport.bc src/jsproxy.bc src/js2python.bc
\
...
@@ -105,6 +107,10 @@ test: all
...
@@ -105,6 +107,10 @@ test: all
pytest
test
/
-v
pytest
test
/
-v
build/test_data.txt
:
test/data.txt
cp test
/data.txt build/test_data.txt
lint
:
lint
:
flake8 src
flake8 src
flake8
test
flake8
test
...
...
test/conftest.py
View file @
bfd0e586
...
@@ -7,7 +7,6 @@ import multiprocessing
...
@@ -7,7 +7,6 @@ import multiprocessing
import
os
import
os
import
pathlib
import
pathlib
import
queue
import
queue
import
shutil
import
sys
import
sys
try
:
try
:
...
@@ -114,16 +113,8 @@ class ChromeWrapper(SeleniumWrapper):
...
@@ -114,16 +113,8 @@ class ChromeWrapper(SeleniumWrapper):
if
pytest
is
not
None
:
if
pytest
is
not
None
:
@
pytest
.
fixture
(
scope
=
'session'
)
def
setup_resources
():
shutil
.
copyfile
(
TEST_PATH
/
'data.txt'
,
BUILD_PATH
/
'test_data.txt'
)
shutil
.
copyfile
(
TEST_PATH
.
parent
/
'src'
/
'test.html'
,
BUILD_PATH
/
'test.html'
)
@
pytest
.
fixture
(
params
=
[
'firefox'
,
'chrome'
])
@
pytest
.
fixture
(
params
=
[
'firefox'
,
'chrome'
])
def
selenium_standalone
(
request
,
setup_resources
):
def
selenium_standalone
(
request
):
if
request
.
param
==
'firefox'
:
if
request
.
param
==
'firefox'
:
cls
=
FirefoxWrapper
cls
=
FirefoxWrapper
elif
request
.
param
==
'chrome'
:
elif
request
.
param
==
'chrome'
:
...
@@ -136,7 +127,7 @@ if pytest is not None:
...
@@ -136,7 +127,7 @@ if pytest is not None:
selenium
.
driver
.
quit
()
selenium
.
driver
.
quit
()
@
pytest
.
fixture
(
params
=
[
'firefox'
,
'chrome'
],
scope
=
'module'
)
@
pytest
.
fixture
(
params
=
[
'firefox'
,
'chrome'
],
scope
=
'module'
)
def
_selenium_cached
(
request
,
setup_resources
):
def
_selenium_cached
(
request
):
# Cached selenium instance. This is a copy-paste of
# Cached selenium instance. This is a copy-paste of
# selenium_standalone to avoid fixture scope issues
# selenium_standalone to avoid fixture scope issues
if
request
.
param
==
'firefox'
:
if
request
.
param
==
'firefox'
:
...
...
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