diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/database.scm | 39 | ||||
| -rw-r--r-- | tests/http.scm | 26 |
2 files changed, 40 insertions, 25 deletions
diff --git a/tests/database.scm b/tests/database.scm index e71c7f7..6ca9d1c 100644 --- a/tests/database.scm +++ b/tests/database.scm @@ -25,19 +25,30 @@ (define example-spec '((#:name . "guix") - (#:url . "git://git.savannah.gnu.org/guix.git") - (#:load-path . ".") - (#:file . "/tmp/gnu-system.scm") + (#:load-path-inputs . ("savannah")) + (#:package-path-inputs . ()) + (#:proc-input . "savannah") + (#:proc-file . "/tmp/gnu-system.scm") (#:proc . hydra-jobs) - (#:arguments (subset . "hello")) - (#:branch . "master") - (#:tag . #f) - (#:commit . #f) - (#:no-compile? . #f))) - -(define* (make-dummy-eval #:optional (revision "cabba3e")) + (#:proc-args (subset . "hello")) + (#:inputs . (((#:name . "savannah") + (#:url . "git://git.savannah.gnu.org/guix.git") + (#:load-path . ".") + (#:branch . "master") + (#:tag . #f) + (#:commit . #f) + (#:no-compile? . #f)) + ((#:name . "maintenance") + (#:url . "git://git.savannah.gnu.org/guix/maintenance.git") + (#:load-path . ".") + (#:branch . "master") + (#:tag . #f) + (#:commit . #f) + (#:no-compile? . #f)))))) + +(define* (make-dummy-eval #:optional (commits '("cabba3e 61730ea"))) `((#:specification . "guix") - (#:revision . ,revision))) + (#:commits . ,commits))) (define* (make-dummy-job #:optional (name "foo")) `((#:name . ,name) @@ -90,11 +101,11 @@ (test-assert "sqlite-exec" (begin (sqlite-exec (%db) "\ -INSERT INTO Evaluations (specification, revision) VALUES (1, 1);") +INSERT INTO Evaluations (specification, commits) VALUES (1, 1);") (sqlite-exec (%db) "\ -INSERT INTO Evaluations (specification, revision) VALUES (2, 2);") +INSERT INTO Evaluations (specification, commits) VALUES (2, 2);") (sqlite-exec (%db) "\ -INSERT INTO Evaluations (specification, revision) VALUES (3, 3);") +INSERT INTO Evaluations (specification, commits) VALUES (3, 3);") (sqlite-exec (%db) "SELECT * FROM Evaluations;"))) (test-equal "db-add-specification" diff --git a/tests/http.scm b/tests/http.scm index ba53887..e05fdc5 100644 --- a/tests/http.scm +++ b/tests/http.scm @@ -97,7 +97,7 @@ (define evaluations-query-result '((#:id . 2) (#:specification . "guix") - (#:revision . "fakesha2"))) + (#:commits . ("fakesha2" "fakesha3")))) (test-group-with-cleanup "http" (test-assert "object->json-string" @@ -171,21 +171,25 @@ (#:eval-id . 1))) (specification '((#:name . "guix") - (#:url . "git://git.savannah.gnu.org/guix.git") - (#:load-path . ".") - (#:file . "/tmp/gnu-system.scm") + (#:load-path-inputs . ("savannah")) + (#:package-path-inputs . ()) + (#:proc-input . "savannah") + (#:proc-file . "/tmp/gnu-system.scm") (#:proc . hydra-jobs) - (#:arguments (subset . "hello")) - (#:branch . "master") - (#:tag . #f) - (#:commit . #f) - (#:no-compile? . #f))) + (#:proc-args (subset . "hello")) + (#:inputs . (((#:name . "savannah") + (#:url . "git://git.savannah.gnu.org/guix.git") + (#:load-path . ".") + (#:branch . "master") + (#:tag . #f) + (#:commit . #f) + (#:no-compile? . #f)))))) (evaluation1 '((#:specification . "guix") - (#:revision . "fakesha1"))) + (#:commits . ("fakesha1" "fakesha3")))) (evaluation2 '((#:specification . "guix") - (#:revision . "fakesha2")))) + (#:commits . ("fakesha2" "fakesha3"))))) (db-add-build (%db) build1) (db-add-build (%db) build2) (db-add-derivation (%db) derivation1) |