Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: lockfiles #3231

Merged
merged 14 commits into from
Nov 3, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use http for lock_check tests
  • Loading branch information
ry committed Oct 29, 2019
commit 3e6a61694dc5bf0c1d02ade91c9a596b66034439
6 changes: 4 additions & 2 deletions cli/tests/integration_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -349,15 +349,17 @@ itest!(_050_more_jsons {
});

itest!(lock_check_ok {
args: "run --lock-check=lock_check_ok.json 003_relative_import.ts",
args: "run --lock-check=lock_check_ok.json http:https://127.0.0.1:4545/cli/tests/003_relative_import.ts",
output: "003_relative_import.ts.out",
http_server: true,
});

itest!(lock_check_err {
args: "run --lock-check=lock_check_err.json 003_relative_import.ts",
args: "run --lock-check=lock_check_err.json http:https://127.0.0.1:4545/cli/tests/003_relative_import.ts",
output: "lock_check_err.out",
check_stderr: true,
exit_code: 10,
http_server: true,
});

itest!(async_error {
Expand Down
5 changes: 2 additions & 3 deletions cli/tests/lock_check_err.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"file:https:///Users/rld/src/deno/cli/tests/subdir/print_hello.ts": "bad",
"file:https:///Users/rld/src/deno/cli/tests/003_relative_import.ts": "alsobad",
"file:https:///Users/rld/src/deno/cli/tests/subdir/print_hello.ts": "somemissing"
"http:https://localhost:4545/cli/tests/subdir/print_hello.ts": "5c93c66125878389f47f4abcac003f4be1276c5223612c26302460d71841e287",
"http:https://localhost:4545/cli/tests/003_relative_import.ts": "bad"
}
2 changes: 1 addition & 1 deletion cli/tests/lock_check_err.out
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[WILDCARD]lock file check failed lock_check_err.json file:https:///[WILDCARD]tests/003_relative_import.ts
[WILDCARD]lock file check failed lock_check_err.json [WILDCARD]tests/003_relative_import.ts
4 changes: 2 additions & 2 deletions cli/tests/lock_check_ok.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"file:https:///Users/rld/src/deno/cli/tests/003_relative_import.ts": "da3b7f60f5ff635dbc27f3e5e05420f0f2c34676f080ef935ea547116424adeb",
"file:https:///Users/rld/src/deno/cli/tests/subdir/print_hello.ts": "5c93c66125878389f47f4abcac003f4be1276c5223612c26302460d71841e287"
"http:https://127.0.0.1:4545/cli/tests/subdir/print_hello.ts": "5c93c66125878389f47f4abcac003f4be1276c5223612c26302460d71841e287",
"http:https://127.0.0.1:4545/cli/tests/003_relative_import.ts": "da3b7f60f5ff635dbc27f3e5e05420f0f2c34676f080ef935ea547116424adeb"
}