@@ -1547,40 +1547,46 @@
 	      (let* ((treg         (or test-registry
 				       (tests:get-all)))
 		     (test-path    (or (hash-table-ref/default treg test-name #f)
 				       (conc *toppath* "/tests/" test-name)))
 		     (test-configf (conc test-path "/testconfig"))
-		     (testexists (let loop ((tries-left 7))
+		     (testexists (let loop ((tries-left 14))
                                    (cond
                                     ( (and (common:file-exists? test-configf)(file-read-access? test-configf))
                                       #t)
                                     ( (common:file-exists? test-configf)
                                       (debug:print 0 *default-log-port* "WARNING: Cannot read testconfig file: "test-configf)
                                       #f)
                                     ( (and wait-a-minute (> tries-left 0))
+                                      (debug:print 0 *default-log-port* "WARNING: Cannot read testconfig.  Sleeping 10 and will try again.  Tries left: " tries-left)
                                       (thread-sleep! 10)
                                       (loop (sub1 tries-left)))
                                     (else
-                                     (debug:print 0 *default-log-port* "WARNING: testconfig file does not exist: "test-configf)
+                                     (debug:print 0 *default-log-port* "WARNING: testconfig file does not exist: "test-configf " [wait-a-minute=" wait-a-minute "]")
                                      #f))))
 		     (tcfg         (if testexists
 				       (read-config test-configf #f system-allowed
 						    environ-patt: (if system-allowed
 								      "pre-launch-env-vars"
 								      #f))
 				       #f)))
-		(if (and tcfg cache-file) (hash-table-set! tcfg "have fulldata" #t)) ;; mark this as fully read data
-		(if tcfg (hash-table-set! *testconfigs* test-full-name tcfg))
-		(if (and testexists
-			 cache-file
-			 (file-write-access? cache-path)
-			 allow-write-cache)
-		    (let ((tpath (conc cache-path "/.testconfig")))
-		      (debug:print-info 1 *default-log-port* "Caching testconfig for " test-name " in " tpath)
-                      (if (and tcfg (not (common:in-running-test?)))
-                          (configf:write-alist tcfg tpath))))
-		tcfg))))))
+
+                (cond
+                 ((testexists
+                   (if (and tcfg cache-file) (hash-table-set! tcfg "have fulldata" #t)) ;; mark this as fully read data
+		   (if tcfg (hash-table-set! *testconfigs* test-full-name tcfg)) ;; side effect
+		   (if (and testexists
+			    cache-file
+			    (file-write-access? cache-path)
+			    allow-write-cache)
+		       (let ((tpath (conc cache-path "/.testconfig")))
+		         (debug:print-info 1 *default-log-port* "Caching testconfig for " test-name " in " tpath)
+                         (if (and tcfg (not (common:in-running-test?)))
+                             (configf:write-alist tcfg tpath))))
+		   tcfg))
+                  (else
+                   #f))))))))
   
 ;; sort tests by priority and waiton
 ;; Move test specific stuff to a test unit FIXME one of these days
 (define (tests:sort-by-priority-and-waiton test-records)
   (if (eq? (hash-table-size test-records) 0)