Address a few issues in the load new guix revision tests

1 files changed, 60 insertions, 46 deletions

diff --git a/tests/jobs-load-new-guix-revision.scm b/tests/jobs-load-new-guix-revision.scm
index 7d722af..b70d702 100644
--- a/tests/jobs-load-new-guix-revision.scm
+++ b/tests/jobs-load-new-guix-revision.scm
@@ -39,10 +39,10 @@
        ((guix-data-service jobs load-new-guix-revision)
         channel->derivations-by-system
         (lambda (conn store channel fetch-with-authentication?)
-          '((x86_64-linux
+          '(("x86_64-linux"
              .
-             ((manifest-entry-item . /gnu/store/foo.drv)
-              (profile . /gnu/store/bar.drv))))))
+             ((manifest-entry-item . "/gnu/store/foo.drv")
+              (profile . "/gnu/store/bar.drv"))))))
 
        (mock
         ((guix-data-service jobs load-new-guix-revision)
@@ -97,30 +97,37 @@
        ((guix-data-service jobs load-new-guix-revision)
         channel->derivations-by-system
         (lambda (conn store channel fetch-with-authentication?)
-          '(x86_64-linux
-            .
-            ((manifest-entry-item . /gnu/store/foo.drv)
-             (profile . /gnu/store/bar.drv)))))
+          '(("x86_64-linux"
+             .
+             ((manifest-entry-item . "/gnu/store/foo.drv")
+              (profile . "/gnu/store/bar.drv"))))))
 
        (mock
         ((guix-data-service jobs load-new-guix-revision)
-         setup-logging
-         (lambda (conn thunk)
-           (thunk)))
+         load-channel-instances
+         (lambda (git-repository-id commit
+                 channel-derivations-by-system)
+           0))
 
         (mock
          ((guix-data-service jobs load-new-guix-revision)
-          channel-derivations-by-system->guix-store-item
-          (lambda (store channel-derivations-by-system)
-            #f))
+          setup-logging
+          (lambda (conn thunk)
+            (thunk)))
 
-         (match (enqueue-load-new-guix-revision-job
-                 conn
-                 (git-repository-url->git-repository-id conn "test-url")
-                 "test-commit"
-                 "test-source")
-           ((id)
-            (process-load-new-guix-revision-job id))))))))
+         (mock
+          ((guix-data-service jobs load-new-guix-revision)
+           channel-derivations-by-system->guix-store-item
+           (lambda (store channel-derivations-by-system)
+             #f))
+
+          (match (enqueue-load-new-guix-revision-job
+                  conn
+                  (git-repository-url->git-repository-id conn "test-url")
+                  "test-commit"
+                  "test-source")
+            ((id)
+             (process-load-new-guix-revision-job id)))))))))
 
    (exec-query conn "TRUNCATE load_new_guix_revision_jobs CASCADE")
 
@@ -135,43 +142,50 @@
       (mock
        ((guix-data-service jobs load-new-guix-revision)
         channel->derivations-by-system
-        (lambda (conn store channel)
-          '(x86_64-linux
-            .
-            ((manifest-entry-item . /gnu/store/foo.drv)
-             (profile . /gnu/store/bar.drv)))))
+        (lambda (conn store channel fetch-with-authentication?)
+          '(("x86_64-linux"
+             .
+             ((manifest-entry-item . "/gnu/store/foo.drv")
+              (profile . "/gnu/store/bar.drv"))))))
 
        (mock
         ((guix-data-service jobs load-new-guix-revision)
-         setup-logging
-         (lambda (conn thunk)
-           (thunk)))
+         load-channel-instances
+         (lambda (git-repository-id commit
+                                    channel-derivations-by-system)
+           0))
 
         (mock
          ((guix-data-service jobs load-new-guix-revision)
-          channel-derivations-by-system->guix-store-item
-          (lambda (store channel-derivations-by-system)
-            "/gnu/store/test"))
+          setup-logging
+          (lambda (conn thunk)
+            (thunk)))
 
          (mock
           ((guix-data-service jobs load-new-guix-revision)
-           extract-information-from
-           (lambda (conn store git-repository-id commit store-path)
-             #f))
+           channel-derivations-by-system->guix-store-item
+           (lambda (store channel-derivations-by-system)
+             "/gnu/store/test"))
 
           (mock
-           ((guix channels)
-            channel-news-for-commit
-            (lambda (channel commit)
-              '()))
-
-           (match (enqueue-load-new-guix-revision-job
-                   conn
-                   (git-repository-url->git-repository-id conn "test-url")
-                   "test-commit"
-                   "test-source")
-             ((id)
-              (process-load-new-guix-revision-job id))))))))))
+           ((guix-data-service jobs load-new-guix-revision)
+            extract-information-from
+            (lambda (conn store git-repository-id commit store-path)
+              #f))
+
+           (mock
+            ((guix channels)
+             channel-news-for-commit
+             (lambda (channel commit)
+               '()))
+
+            (match (enqueue-load-new-guix-revision-job
+                    conn
+                    (git-repository-url->git-repository-id conn "test-url")
+                    "test-commit"
+                    "test-source")
+              ((id)
+               (process-load-new-guix-revision-job id)))))))))))
 
    (exec-query conn "TRUNCATE load_new_guix_revision_jobs CASCADE")