diff options
Diffstat (limited to 'guix-data-service/model/system-test.scm')
| -rw-r--r-- | guix-data-service/model/system-test.scm | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/guix-data-service/model/system-test.scm b/guix-data-service/model/system-test.scm index fe2fb83..ab438b7 100644 --- a/guix-data-service/model/system-test.scm +++ b/guix-data-service/model/system-test.scm @@ -23,7 +23,6 @@ #:use-module (guix utils) #:use-module (guix-data-service model utils) #:use-module (guix-data-service model location) - #:use-module (guix-data-service model derivation) #:export (insert-system-tests-for-guix-revision select-system-tests-for-guix-revision @@ -39,7 +38,7 @@ "system_tests" '(name description location_id) (map (match-lambda - ((name description derivation-file-names-by-system location-data) + ((name description derivation-ids-by-system location-data) (list name description (location->location-id @@ -48,20 +47,13 @@ system-test-data))) (data (append-map - (lambda (system-test-id derivation-file-names-by-system) - (let ((systems - (map car derivation-file-names-by-system)) - (derivation-ids - (derivation-file-names->derivation-ids - conn - (map cdr derivation-file-names-by-system)))) - (map (lambda (system derivation-id) - (list guix-revision-id - system-test-id - derivation-id - system)) - systems - derivation-ids))) + (lambda (system-test-id derivation-ids-by-system) + (map (lambda (system-and-derivation-id) + (list guix-revision-id + system-test-id + (cdr system-and-derivation-id) + (car system-and-derivation-id))) + derivation-ids-by-system)) system-test-ids (map third system-test-data)))) |