Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -1261,13 +1261,13 @@
 ;; Convert calling routines to get list of run-ids and loop, do not use the get-tests-for-runs
 ;;
 
 (define (db:delete-test-records dbstruct run-id test-id)
   (let ((db (db:get-db dbstruct run-id)))
-  (db:general-call db 'delete-test-step-records (list test-id))
-  (db:general-call db 'delete-test-data-records (list test-id))
-  (sqlite3:execute db "UPDATE tests SET state='DELETED',status='n/a',comment='' WHERE id=?;" test-id))
+    (db:general-call db 'delete-test-step-records (list test-id))
+    (db:general-call db 'delete-test-data-records (list test-id))
+    (sqlite3:execute db "UPDATE tests SET state='DELETED',status='n/a',comment='' WHERE id=?;" test-id)))
 
 (define (db:delete-tests-for-run dbdbstruct run-id)
   (let ((db (db:get-db dbstruct run-id)))
      (sqlite3:execute db "DELETE FROM tests WHERE run_id=?;" run-id)))
 
@@ -1296,20 +1296,20 @@
 ;; speed up for common cases with a little logic
 ;; NB// Ultimately this will be deprecated in deference to mt:test-set-state-status-by-id
 ;;
 (define (db:test-set-state-status-by-id dbstruct run-id test-id newstate newstatus newcomment)
   (let ((db (db:get-db dbstruct run-id)))
-  (cond
-   ((and newstate newstatus newcomment)
-    (sqlite3:execute db "UPDATE tests SET state=?,status=?,comment=? WHERE id=?;" newstate newstatus newcomment test-id))
-   ((and newstate newstatus)
-    (sqlite3:execute db "UPDATE tests SET state=?,status=? WHERE id=?;" newstate newstatus test-id))
-   (else
-    (if newstate   (sqlite3:execute db "UPDATE tests SET state=?   WHERE id=?;" newstate   test-id))
-    (if newstatus  (sqlite3:execute db "UPDATE tests SET status=?  WHERE id=?;" newstatus  test-id))
-    (if newcomment (sqlite3:execute db "UPDATE tests SET comment=? WHERE id=?;" newcomment test-id))))
-  (mt:process-triggers test-id newstate newstatus))
+    (cond
+     ((and newstate newstatus newcomment)
+      (sqlite3:execute db "UPDATE tests SET state=?,status=?,comment=? WHERE id=?;" newstate newstatus newcomment test-id))
+     ((and newstate newstatus)
+      (sqlite3:execute db "UPDATE tests SET state=?,status=? WHERE id=?;" newstate newstatus test-id))
+     (else
+      (if newstate   (sqlite3:execute db "UPDATE tests SET state=?   WHERE id=?;" newstate   test-id))
+      (if newstatus  (sqlite3:execute db "UPDATE tests SET status=?  WHERE id=?;" newstatus  test-id))
+      (if newcomment (sqlite3:execute db "UPDATE tests SET comment=? WHERE id=?;" newcomment test-id))))
+    (mt:process-triggers test-id newstate newstatus)))
 
 ;; Never used, but should be?
 (define (db:test-set-state-status-by-run-id-testname db run-id test-name item-path status state)
   (sqlite3:execute db "UPDATE tests SET state=?,status=?,event_time=strftime('%s','now') WHERE run_id=? AND testname=? AND item_path=?;" 
  		   state status run-id test-name item-path))
@@ -1664,18 +1664,10 @@
 
 (define (db:roll-up-pass-fail-counts db run-id test-name item-path status)
   (if (and (not (equal? item-path ""))
 	   (member status '("PASS" "WARN" "FAIL" "WAIVED" "RUNNING" "CHECK" "SKIP")))
       (let ((db (db:get-db dbstruct rid)))
-      (handle-exceptions
-       exn
-       (begin 
-	 (debug:print 0 "Problem with call to cdb:remote-run, database may be locked and read-only, waiting and trying again ...")
-	 (thread-sleep! 10)
-	 (apply cdb:remote-run proc db params))
-       (apply cdb:client-call *runremote* 'immediate #f *default-numtries* open-run-close proc #f params))
-      (begin
 	(db:general-call db 'update-pass-fail-counts (list run-id test-name run-id test-name run-id test-name))
 	(if (equal? status "RUNNING")
 	    (db:general-call db 'top-test-set-running (list run-id test-name))
 	    (db:general-call db 'top-test-set-per-pf-counts (list run-id test-name run-id test-name run-id test-name)))
 	#f)