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
7f3027b6
Commit
7f3027b6
authored
Sep 07, 2018
by
Michael Droettboom
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tests
parent
9836791b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
11 deletions
+14
-11
src/pyodide.js
src/pyodide.js
+7
-5
src/test.html
src/test.html
+3
-0
test/test_package_loading.py
test/test_package_loading.py
+4
-6
No files found.
src/pyodide.js
View file @
7f3027b6
...
@@ -45,24 +45,27 @@ var languagePluginLoader = new Promise((resolve, reject) => {
...
@@ -45,24 +45,27 @@ var languagePluginLoader = new Promise((resolve, reject) => {
const
package
=
_uri_to_package_name
(
package_uri
);
const
package
=
_uri_to_package_name
(
package_uri
);
if
(
package
==
null
)
{
if
(
package
==
null
)
{
throw
new
Error
(
`Invalid package name or URI '
${
package_uri
}
'`
);
console
.
error
(
`Invalid package name or URI '
${
package_uri
}
'`
);
return
;
}
else
if
(
package
==
package_uri
)
{
}
else
if
(
package
==
package_uri
)
{
package_uri
=
'
default channel
'
;
package_uri
=
'
default channel
'
;
}
}
if
(
package
in
loadedPackages
)
{
if
(
package
in
loadedPackages
)
{
if
(
package_uri
!=
loadedPackages
[
package
])
{
if
(
package_uri
!=
loadedPackages
[
package
])
{
throw
new
E
rror
(
console
.
e
rror
(
`URI mismatch, attempting to load package `
+
`URI mismatch, attempting to load package `
+
`
${
package
}
from
${
package_uri
}
while it is already `
+
`
${
package
}
from
${
package_uri
}
while it is already `
+
`loaded from
${
loadedPackages
[
package
]}
!`
);
`loaded from
${
loadedPackages
[
package
]}
!`
);
return
;
}
}
}
else
if
(
package
in
toLoad
)
{
}
else
if
(
package
in
toLoad
)
{
if
(
package_uri
!=
toLoad
[
package
])
{
if
(
package_uri
!=
toLoad
[
package
])
{
throw
new
E
rror
(
console
.
e
rror
(
`URI mismatch, attempting to load package `
+
`URI mismatch, attempting to load package `
+
`
${
package
}
from
${
package_uri
}
while it is already `
+
`
${
package
}
from
${
package_uri
}
while it is already `
+
`being loaded from
${
toLoad
[
package
]}
!`
);
`being loaded from
${
toLoad
[
package
]}
!`
);
return
;
}
}
}
else
{
}
else
{
console
.
log
(
`Loading
${
package
}
from
${
package_uri
}
`
);
console
.
log
(
`Loading
${
package
}
from
${
package_uri
}
`
);
...
@@ -125,8 +128,7 @@ var languagePluginLoader = new Promise((resolve, reject) => {
...
@@ -125,8 +128,7 @@ var languagePluginLoader = new Promise((resolve, reject) => {
let
loadPackage
=
(
names
)
=>
{
let
loadPackage
=
(
names
)
=>
{
/* We want to make sure that only one loadPackage invocation runs at any
/* We want to make sure that only one loadPackage invocation runs at any
* given time, so this creates a "chain" of promises. */
* given time, so this creates a "chain" of promises. */
loadPackagePromise
=
loadPackagePromise
.
then
(()
=>
_loadPackage
(
names
))
loadPackagePromise
=
loadPackagePromise
.
then
(()
=>
_loadPackage
(
names
));
.
catch
((
e
)
=>
console
.
log
(
e
.
to_string
()));
return
loadPackagePromise
;
return
loadPackagePromise
;
};
};
...
...
src/test.html
View file @
7f3027b6
...
@@ -13,6 +13,9 @@
...
@@ -13,6 +13,9 @@
console
.
info
=
function
(
message
)
{
console
.
info
=
function
(
message
)
{
window
.
logs
.
push
(
message
);
window
.
logs
.
push
(
message
);
}
}
console
.
error
=
function
(
message
)
{
window
.
logs
.
push
(
message
);
}
</script>
</script>
<script
src=
"pyodide_dev.js"
></script>
<script
src=
"pyodide_dev.js"
></script>
</head>
</head>
...
...
test/test_package_loading.py
View file @
7f3027b6
...
@@ -25,14 +25,12 @@ def test_uri_mismatch(selenium_standalone):
...
@@ -25,14 +25,12 @@ def test_uri_mismatch(selenium_standalone):
def
test_invalid_package_name
(
selenium
):
def
test_invalid_package_name
(
selenium
):
with
pytest
.
raises
(
WebDriverException
,
match
=
"Invalid package name or URI"
):
selenium
.
load_package
(
'wrong name+$'
)
selenium
.
load_package
(
'wrong name+$'
)
assert
"Invalid package name or URI"
in
selenium
.
logs
selenium
.
clean_logs
()
selenium
.
clean_logs
()
with
pytest
.
raises
(
WebDriverException
,
match
=
"Invalid package name or URI"
):
selenium
.
load_package
(
'tcp://some_url'
)
selenium
.
load_package
(
'tcp://some_url'
)
assert
"Invalid package name or URI"
in
selenium
.
logs
@
pytest
.
mark
.
parametrize
(
'packages'
,
[[
'pyparsing'
,
'pytz'
],
@
pytest
.
mark
.
parametrize
(
'packages'
,
[[
'pyparsing'
,
'pytz'
],
...
...
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