Merge remote-tracking branch 'savannah/master' into mesa-updates

Change-Id: Iad185e2ced97067b3dff8fd722435a6c5e2c00e5

1 files changed, 26 insertions, 27 deletions

diff --git a/tests/store-database.scm b/tests/store-database.scm
index d8f3ce8070..67d464386d 100644
--- a/tests/store-database.scm
+++ b/tests/store-database.scm
@@ -87,23 +87,22 @@
    (lambda (db-file port)
      (delete-file db-file)
      (with-database db-file db
-       (sqlite-register db
-                        #:path "/gnu/foo"
-                        #:references '()
-                        #:deriver "/gnu/foo.drv"
-                        #:hash (string-append "sha256:" (make-string 64 #\e))
-                        #:nar-size 1234)
-       (sqlite-register db
-                        #:path "/gnu/bar"
-                        #:references '("/gnu/foo")
-                        #:deriver "/gnu/bar.drv"
-                        #:hash (string-append "sha256:" (make-string 64 #\a))
-                        #:nar-size 4321)
-       (let ((path-id (@@ (guix store database) path-id)))
-         (list (path-id db "/gnu/foo")
-               (path-id db "/gnu/bar")))))))
+       (register-valid-path db
+                            #:path "/gnu/foo"
+                            #:references '()
+                            #:deriver "/gnu/foo.drv"
+                            #:hash (string-append "sha256:" (make-string 64 #\e))
+                            #:nar-size 1234)
+       (register-valid-path db
+                            #:path "/gnu/bar"
+                            #:references '("/gnu/foo")
+                            #:deriver "/gnu/bar.drv"
+                            #:hash (string-append "sha256:" (make-string 64 #\a))
+                            #:nar-size 4321)
+       (list (valid-path-id db "/gnu/foo")
+             (valid-path-id db "/gnu/bar"))))))
 
-(test-assert "sqlite-register with unregistered references"
+(test-assert "register-valid-path with unregistered references"
   ;; Make sure we get a "NOT NULL constraint failed: Refs.reference" error
   ;; when we try to add references that are not registered yet.  Better safe
   ;; than sorry.
@@ -113,17 +112,17 @@
      (catch 'sqlite-error
        (lambda ()
          (with-database db-file db
-           (sqlite-register db #:path "/gnu/foo"
-                            #:references '("/gnu/bar")
-                            #:deriver "/gnu/foo.drv"
-                            #:hash (string-append "sha256:" (make-string 64 #\e))
-                            #:nar-size 1234))
+           (register-valid-path db #:path "/gnu/foo"
+                                #:references '("/gnu/bar")
+                                #:deriver "/gnu/foo.drv"
+                                #:hash (string-append "sha256:" (make-string 64 #\e))
+                                #:nar-size 1234))
          #f)
        (lambda args
          (pk 'welcome-exception! args)
          #t)))))
 
-(test-equal "sqlite-register with incorrect size"
+(test-equal "register-valid-path with incorrect size"
   'out-of-range
   (call-with-temporary-output-file
    (lambda (db-file port)
@@ -131,11 +130,11 @@
      (catch #t
        (lambda ()
          (with-database db-file db
-           (sqlite-register db #:path "/gnu/foo"
-                            #:references '("/gnu/bar")
-                            #:deriver "/gnu/foo.drv"
-                            #:hash (string-append "sha256:" (make-string 64 #\e))
-                            #:nar-size -1234))
+           (register-valid-path db #:path "/gnu/foo"
+                                #:references '("/gnu/bar")
+                                #:deriver "/gnu/foo.drv"
+                                #:hash (string-append "sha256:" (make-string 64 #\e))
+                                #:nar-size -1234))
          #f)
        (lambda (key . _)
          key)))))