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
c9d5ba3c
Commit
c9d5ba3c
authored
Aug 28, 2018
by
Roman Yurchak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Better logs when PyodideInited() or PackageLoaded() fails on Chrome
parent
f35aa2ee
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
10 deletions
+30
-10
src/pyodide.js
src/pyodide.js
+6
-8
test/conftest.py
test/conftest.py
+24
-2
No files found.
src/pyodide.js
View file @
c9d5ba3c
...
@@ -4,11 +4,10 @@
...
@@ -4,11 +4,10 @@
// Regexp for validating package name and URI
// Regexp for validating package name and URI
var
package_name_regexp
=
'
[a-z0-9_
\
-]+
'
var
package_name_regexp
=
'
[a-z0-9_
\
-]+
'
var
package_uri_regexp
=
new
RegExp
(
var
package_uri_regexp
=
'
^https?://.*?(
'
+
package_name_regexp
+
'
).js$
'
,
'
i
'
);
new
RegExp
(
'
^https?://.*?(
'
+
package_name_regexp
+
'
).js$
'
,
'
i
'
);
var
package_name_regexp
=
new
RegExp
(
'
^
'
+
package_name_regexp
+
'
$
'
,
'
i
'
);
var
package_name_regexp
=
new
RegExp
(
'
^
'
+
package_name_regexp
+
'
$
'
,
'
i
'
);
var
languagePluginLoader
=
new
Promise
((
resolve
,
reject
)
=>
{
var
languagePluginLoader
=
new
Promise
((
resolve
,
reject
)
=>
{
// This is filled in by the Makefile to be either a local file or the
// This is filled in by the Makefile to be either a local file or the
// deployed location. TODO: This should be done in a less hacky
// deployed location. TODO: This should be done in a less hacky
...
@@ -34,7 +33,6 @@ var languagePluginLoader = new Promise((resolve, reject) => {
...
@@ -34,7 +33,6 @@ var languagePluginLoader = new Promise((resolve, reject) => {
}
}
};
};
let
loadPackage
=
(
names
)
=>
{
let
loadPackage
=
(
names
)
=>
{
// DFS to find all dependencies of the requested packages
// DFS to find all dependencies of the requested packages
let
packages
=
window
.
pyodide
.
packages
.
dependencies
;
let
packages
=
window
.
pyodide
.
packages
.
dependencies
;
...
@@ -82,7 +80,7 @@ var languagePluginLoader = new Promise((resolve, reject) => {
...
@@ -82,7 +80,7 @@ var languagePluginLoader = new Promise((resolve, reject) => {
pyodide
.
monitorRunDependencies
=
(
n
)
=>
{
pyodide
.
monitorRunDependencies
=
(
n
)
=>
{
if
(
n
===
0
)
{
if
(
n
===
0
)
{
for
(
let
package
in
toLoad
)
{
for
(
let
package
in
toLoad
)
{
loadedPackages
[
package
]
=
toLoad
[
package
];
loadedPackages
[
package
]
=
toLoad
[
package
];
}
}
delete
pyodide
.
monitorRunDependencies
;
delete
pyodide
.
monitorRunDependencies
;
const
packageList
=
Array
.
from
(
Object
.
keys
(
toLoad
)).
join
(
'
,
'
);
const
packageList
=
Array
.
from
(
Object
.
keys
(
toLoad
)).
join
(
'
,
'
);
...
@@ -93,10 +91,10 @@ var languagePluginLoader = new Promise((resolve, reject) => {
...
@@ -93,10 +91,10 @@ var languagePluginLoader = new Promise((resolve, reject) => {
for
(
let
package
in
toLoad
)
{
for
(
let
package
in
toLoad
)
{
let
script
=
document
.
createElement
(
'
script
'
);
let
script
=
document
.
createElement
(
'
script
'
);
let
package_uri
=
toLoad
[
package
];
let
package_uri
=
toLoad
[
package
];
if
(
package_uri
==
'
packages.json
'
)
{
if
(
package_uri
==
'
default channel
'
)
{
script
.
src
=
`
${
baseURL
}${
package
}
.js`
;
script
.
src
=
`
${
baseURL
}${
package
}
.js`
;
}
else
{
}
else
{
script
.
src
=
`
${
package_uri
}
`
;
script
.
src
=
`
${
package_uri
}
`
;
}
}
script
.
onerror
=
(
e
)
=>
{
reject
(
e
);
};
script
.
onerror
=
(
e
)
=>
{
reject
(
e
);
};
document
.
body
.
appendChild
(
script
);
document
.
body
.
appendChild
(
script
);
...
...
test/conftest.py
View file @
c9d5ba3c
...
@@ -33,9 +33,20 @@ class PackageLoaded:
...
@@ -33,9 +33,20 @@ class PackageLoaded:
return
bool
(
inited
)
return
bool
(
inited
)
def
_display_driver_logs
(
browser
,
driver
):
if
browser
==
'chrome'
:
print
(
'# Selenium browser logs'
)
print
(
driver
.
get_log
(
"browser"
))
elif
browser
==
'firefox'
:
# browser logs are not available in GeckoDriver
# https://github.com/mozilla/geckodriver/issues/284
print
(
'Cannot access browser logs for Firefox.'
)
class
SeleniumWrapper
:
class
SeleniumWrapper
:
def
__init__
(
self
):
def
__init__
(
self
):
from
selenium.webdriver.support.wait
import
WebDriverWait
from
selenium.webdriver.support.wait
import
WebDriverWait
from
selenium.common.exceptions
import
TimeoutException
driver
=
self
.
get_driver
()
driver
=
self
.
get_driver
()
wait
=
WebDriverWait
(
driver
,
timeout
=
20
)
wait
=
WebDriverWait
(
driver
,
timeout
=
20
)
...
@@ -44,7 +55,11 @@ class SeleniumWrapper:
...
@@ -44,7 +55,11 @@ class SeleniumWrapper:
raise
ValueError
(
f"
{
(
BUILD_PATH
/
'test.html'
).
resolve
()
}
"
raise
ValueError
(
f"
{
(
BUILD_PATH
/
'test.html'
).
resolve
()
}
"
f"does not exist!"
)
f"does not exist!"
)
driver
.
get
(
f'http://127.0.0.1:
{
PORT
}
/test.html'
)
driver
.
get
(
f'http://127.0.0.1:
{
PORT
}
/test.html'
)
wait
.
until
(
PyodideInited
())
try
:
wait
.
until
(
PyodideInited
())
except
TimeoutException
as
exc
:
_display_driver_logs
(
self
.
browser
,
driver
)
raise
TimeoutException
()
self
.
wait
=
wait
self
.
wait
=
wait
self
.
driver
=
driver
self
.
driver
=
driver
...
@@ -68,11 +83,18 @@ class SeleniumWrapper:
...
@@ -68,11 +83,18 @@ class SeleniumWrapper:
return
self
.
driver
.
execute_script
(
catch
)
return
self
.
driver
.
execute_script
(
catch
)
def
load_package
(
self
,
packages
):
def
load_package
(
self
,
packages
):
from
selenium.common.exceptions
import
TimeoutException
self
.
run_js
(
self
.
run_js
(
'window.done = false
\
n
'
+
'window.done = false
\
n
'
+
'pyodide.loadPackage({!r})'
.
format
(
packages
)
+
'pyodide.loadPackage({!r})'
.
format
(
packages
)
+
'.then(function() { window.done = true; })'
)
'.then(function() { window.done = true; })'
)
self
.
wait
.
until
(
PackageLoaded
())
try
:
self
.
wait
.
until
(
PackageLoaded
())
except
TimeoutException
as
exc
:
_display_driver_logs
(
self
.
browser
,
self
.
driver
)
print
(
self
.
logs
)
raise
TimeoutException
()
@
property
@
property
def
urls
(
self
):
def
urls
(
self
):
...
...
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