[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/04: Guard against errors loading system tests
From: |
Christopher Baines |
Subject: |
03/04: Guard against errors loading system tests |
Date: |
Tue, 7 Apr 2020 16:21:30 -0400 (EDT) |
cbaines pushed a commit to branch master
in repository data-service.
commit cdcc6140aacd9922ee6cc14a88d203f8783fa11a
Author: Christopher Baines <address@hidden>
AuthorDate: Tue Apr 7 18:17:01 2020 +0100
Guard against errors loading system tests
---
guix-data-service/jobs/load-new-guix-revision.scm | 41 +++++++++++++++--------
1 file changed, 27 insertions(+), 14 deletions(-)
diff --git a/guix-data-service/jobs/load-new-guix-revision.scm
b/guix-data-service/jobs/load-new-guix-revision.scm
index 6731abf..ceb4e89 100644
--- a/guix-data-service/jobs/load-new-guix-revision.scm
+++ b/guix-data-service/jobs/load-new-guix-revision.scm
@@ -333,17 +333,29 @@ WHERE job_id = $1"
column)))))
(all-system-tests))))
- (let ((system-test-data
- (with-time-logging "getting system tests"
- (inferior-eval-with-store inf store extract))))
-
- (for-each (lambda (derivation-file-names-by-system)
- (for-each (lambda (derivation-file-name)
- (add-temp-root store derivation-file-name))
- (map cdr derivation-file-names-by-system)))
- (map third system-test-data))
-
- system-test-data))
+ (catch
+ #t
+ (lambda ()
+ (let ((system-test-data
+ (with-time-logging "getting system tests"
+ (inferior-eval-with-store inf store extract))))
+
+ (for-each (lambda (derivation-file-names-by-system)
+ (for-each (lambda (derivation-file-name)
+ (add-temp-root store derivation-file-name))
+ (map cdr derivation-file-names-by-system)))
+ (map third system-test-data))
+
+ system-test-data))
+ (lambda (key . args)
+ (display (backtrace) (current-error-port))
+ (display "\n" (current-error-port))
+ (simple-format
+ (current-error-port)
+ "error: all-inferior-system-tests: ~A: ~A\n"
+ key args)
+
+ #f)))
(define (all-inferior-lint-warnings inf store)
(define locales
@@ -1153,9 +1165,10 @@ WHERE job_id = $1"
guix-revision-id
lint-warning-ids)))
- (insert-system-tests-for-guix-revision conn
- guix-revision-id
- inferior-system-tests)
+ (when inferior-system-tests
+ (insert-system-tests-for-guix-revision conn
+ guix-revision-id
+ inferior-system-tests))
(let ((package-derivation-ids
(with-time-logging "inferior-data->package-derivation-ids"