@@ -255,17 +255,30 @@
 	;;  (if newcomment (rmt:general-call 'set-test-comment run-id newcomment test-id))))
 	(rmt:set-state-status-and-roll-up-items run-id test-id #f newstate newstatus newcomment)
 	;; (mt:process-triggers run-id test-id newstate newstatus)
 	#t)))
 
+
+(define (mt:test-set-state-status-by-id-unless-completed run-id test-id newstate newstatus newcomment)
+  (let* ((test-vec   (rmt:get-testinfo-state-status run-id test-id))
+         (state     (vector-ref test-vec 3)))
+    (if (equal? state "COMPLETED")
+        #t
+        (rmt:set-state-status-and-roll-up-items run-id test-id #f newstate newstatus newcomment))))
+
+  
 (define (mt:test-set-state-status-by-testname run-id test-name item-path new-state new-status new-comment)
-  (let ((test-id (rmt:get-test-id run-id test-name item-path)))
-    (rmt:set-state-status-and-roll-up-items run-id test-name item-path new-state new-status new-comment)
-    ;; (mt:process-triggers run-id test-id new-state new-status)
-    #t))
+  ;(let ((test-id (rmt:get-test-id run-id test-name item-path)))
+  (rmt:set-state-status-and-roll-up-items run-id test-name item-path new-state new-status new-comment)
+  ;; (mt:process-triggers run-id test-id new-state new-status)
+  #t);)
 	;;(mt:test-set-state-status-by-id run-id test-id new-state new-status new-comment)))
 
+(define (mt:test-set-state-status-by-testname-unless-completed run-id test-name item-path new-state new-status new-comment)
+  (let ((test-id (rmt:get-test-id run-id test-name item-path)))
+    (mt:test-set-state-status-by-id-unless-completed run-id test-id new-state new-status new-comment)))
+    
 (define (mt:lazy-read-test-config test-name)
   (let ((tconf (hash-table-ref/default *testconfigs* test-name #f)))
     (if tconf
 	tconf
 	(let ((test-dirs (tests:get-tests-search-path *configdat*)))