diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2017-02-20 12:56:14 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2017-02-20 12:56:14 +0200 |
| commit | d15432ca9e9359b865aac63ae47863e94bbce0e4 (patch) | |
| tree | be4e6f52cb8e31f5b5fad637c95c0a730ea76081 /tests | |
| parent | def971689052ebc3e0a68684328c28cac35b8596 (diff) | |
| parent | 3b254d76132627ff62ac5571f4175669164624c5 (diff) | |
| download | gnu-guix-d15432ca9e9359b865aac63ae47863e94bbce0e4.tar gnu-guix-d15432ca9e9359b865aac63ae47863e94bbce0e4.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/cpan.scm | 2 | ||||
| -rw-r--r-- | tests/crate.scm | 2 | ||||
| -rw-r--r-- | tests/gem.scm | 2 | ||||
| -rw-r--r-- | tests/pypi.scm | 4 | ||||
| -rw-r--r-- | tests/syscalls.scm | 3 |
5 files changed, 7 insertions, 6 deletions
diff --git a/tests/cpan.scm b/tests/cpan.scm index 0c28a74d3e..8b588517c9 100644 --- a/tests/cpan.scm +++ b/tests/cpan.scm @@ -72,7 +72,7 @@ test-source) (_ (error "Unexpected URL: " url)))))))) (mock ((guix http-client) http-fetch - (lambda (url) + (lambda (url . rest) (match url ("https://api.metacpan.org/release/Foo-Bar" (values (open-input-string test-json) diff --git a/tests/crate.scm b/tests/crate.scm index 0bb344bb8a..eb93822bbb 100644 --- a/tests/crate.scm +++ b/tests/crate.scm @@ -65,7 +65,7 @@ (test-assert "crate->guix-package" ;; Replace network resources with sample data. (mock ((guix http-client) http-fetch - (lambda (url) + (lambda (url . rest) (match url ("https://crates.io/api/v1/crates/foo" (open-input-string test-crate)) diff --git a/tests/gem.scm b/tests/gem.scm index 669cd8ee60..a39e8ba514 100644 --- a/tests/gem.scm +++ b/tests/gem.scm @@ -47,7 +47,7 @@ (test-assert "gem->guix-package" ;; Replace network resources with sample data. (mock ((guix http-client) http-fetch - (lambda (url) + (lambda (url . rest) (match url ("https://rubygems.org/api/v1/gems/foo.json" (values (open-input-string test-json) diff --git a/tests/pypi.scm b/tests/pypi.scm index a132900566..28cc115a9d 100644 --- a/tests/pypi.scm +++ b/tests/pypi.scm @@ -118,7 +118,7 @@ baz > 13.37") ("https://example.com/foo-1.0.0-py2.py3-none-any.whl" #f) (_ (error "Unexpected URL: " url))))) (mock ((guix http-client) http-fetch - (lambda (url) + (lambda (url . rest) (match url ("https://pypi.python.org/pypi/foo/json" (values (open-input-string test-json) @@ -181,7 +181,7 @@ baz > 13.37") (delete-file-recursively "foo-1.0.0.dist-info"))) (_ (error "Unexpected URL: " url))))) (mock ((guix http-client) http-fetch - (lambda (url) + (lambda (url . rest) (match url ("https://pypi.python.org/pypi/foo/json" (values (open-input-string test-json) diff --git a/tests/syscalls.scm b/tests/syscalls.scm index 1934704375..8db45b41b6 100644 --- a/tests/syscalls.scm +++ b/tests/syscalls.scm @@ -447,7 +447,8 @@ (every (lambda (entry) (match (utmpx-user entry) ((? string?) - (> (utmpx-pid entry) 0)) + (or (eqv? (login-type BOOT_TIME) (utmpx-login-type entry)) + (> (utmpx-pid entry) 0))) (#f ;might be DEAD_PROCESS #t))) entries)))) |