1 files changed, 23 insertions, 29 deletions
diff --git a/tests/jobs-load-new-guix-revision.scm b/tests/jobs-load-new-guix-revision.scm
index 0eaad3f..8213afb 100644
--- a/tests/jobs-load-new-guix-revision.scm
+++ b/tests/jobs-load-new-guix-revision.scm
@@ -48,43 +48,37 @@
 
        (mock
         ((guix-data-service jobs load-new-guix-revision)
-         setup-logging
-         (lambda (conn thunk)
-           (thunk)))
+         channel-derivations-by-system->guix-store-item
+         (lambda (store channel-derivations-by-system)
+           "/gnu/store/test"))
 
         (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"))
+          extract-information-from
+          (lambda* (conn store guix-revision-id commit
+                         guix-source store-path
+                         #:key skip-system-tests?)
+            #t))
 
          (mock
-          ((guix-data-service jobs load-new-guix-revision)
-           extract-information-from
-           (lambda* (conn store guix-revision-id commit
-                          guix-source store-path
-                          #:key skip-system-tests?)
+          ((guix-data-service model channel-instance)
+           insert-channel-instances
+           (lambda (conn guix-revision-id derivations-by-system)
              #t))
 
           (mock
-           ((guix-data-service model channel-instance)
-            insert-channel-instances
-            (lambda (conn guix-revision-id derivations-by-system)
-              #t))
-
-           (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 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 guix_revisions CASCADE")
    (exec-query conn "TRUNCATE load_new_guix_revision_jobs CASCADE")