From 9e93b2b3a8450ff9bc08ec4ca61bde925f1378d7 Mon Sep 17 00:00:00 2001
From: Danjela Lura <danielaluraa@gmail.com>
Date: Fri, 19 Jun 2020 14:16:05 +0200
Subject: Fix the test-model-package-metadata test

Signed-off-by: Christopher Baines <mail@cbaines.net>
---
 tests/model-package-metadata.scm | 83 ++++++++++++++++++++++------------------
 1 file changed, 46 insertions(+), 37 deletions(-)

(limited to 'tests')

diff --git a/tests/model-package-metadata.scm b/tests/model-package-metadata.scm
index cc66aae..2b97465 100644
--- a/tests/model-package-metadata.scm
+++ b/tests/model-package-metadata.scm
@@ -39,45 +39,54 @@
 
     (inferior-packages->license-set-ids conn license-id-lists)))
 
-(with-mock-inferior-packages
- (lambda ()
-   (use-modules (guix-data-service model package)
-                (guix-data-service model git-repository)
-                (guix-data-service model guix-revision)
-                (guix-data-service model package-metadata))
+(mock
+ ((guix-data-service model package-metadata)
+  inferior-packages->translated-package-descriptions-and-synopsis
+  (lambda (inferior inferior-package)
+    (cons `(("en_US.utf8" . "Fake synopsis"))
+          `(("en_US.utf8" . "Fake description")))))
+ (with-mock-inferior-packages
+  (lambda ()
+    (use-modules (guix-data-service model package)
+                 (guix-data-service model git-repository)
+                 (guix-data-service model guix-revision)
+                 (guix-data-service model package-metadata))
 
-   (with-postgresql-connection
-    "test-model-package-metadata"
-    (lambda (conn)
-      (check-test-database! conn)
+    (with-postgresql-connection
+     "test-model-package-metadata"
+     (lambda (conn)
+       (check-test-database! conn)
 
-      (test-assert "inferior-packages->package-metadata-ids"
-        (with-postgresql-transaction
-         conn
-         (lambda (conn)
-           (match
-               (inferior-packages->package-metadata-ids
-                conn
-                (list mock-inferior-package-foo
-                      mock-inferior-package-foo-2)
-                (test-license-set-ids conn))
-             ((x) (number? x))))
-         #:always-rollback? #t))
+       (test-assert "inferior-packages->package-metadata-ids"
+         (with-postgresql-transaction
+          conn
+          (lambda (conn)
+            (match
+                (inferior-packages->package-metadata-ids
+                 conn
+                 ""
+                 (list mock-inferior-package-foo
+                       mock-inferior-package-foo-2)
+                 (test-license-set-ids conn))
+              ((x) (number? x))))
+          #:always-rollback? #t))
 
-      (with-postgresql-transaction
-       conn
-       (lambda (conn)
-         (test-equal "inferior-packages->package-metadata-ids"
-           (inferior-packages->package-metadata-ids
-            conn
-            (list mock-inferior-package-foo
-                  mock-inferior-package-foo-2)
-            (test-license-set-ids conn))
-           (inferior-packages->package-metadata-ids
-            conn
-            (list mock-inferior-package-foo
-                  mock-inferior-package-foo-2)
-            (test-license-set-ids conn)))
-         #:always-rollback? #t))))))
+       (with-postgresql-transaction
+        conn
+        (lambda (conn)
+          (test-equal "inferior-packages->package-metadata-ids"
+            (inferior-packages->package-metadata-ids
+             conn
+             ""
+             (list mock-inferior-package-foo
+                   mock-inferior-package-foo-2)
+             (test-license-set-ids conn))
+            (inferior-packages->package-metadata-ids
+             conn
+             ""
+             (list mock-inferior-package-foo
+                   mock-inferior-package-foo-2)
+             (test-license-set-ids conn)))
+          #:always-rollback? #t)))))))
 
 (test-end)
-- 
cgit v1.2.3