Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -2197,24 +2197,33 @@
 					    (if not-in 
 						" NOT IN ('"
 						" IN ('") )
 					(string-intersperse statuses "','")
 					"')")))
-	     (interim-qry       (conc " AND " (if not-in "NOT " "") "( ( state='COMPLETED' AND " statuses-qry " ) "
+	     (interim-qry       (conc " AND " (if not-in "NOT " "") "( state='COMPLETED' " (if statuses-qry (conc " AND " statuses-qry " ) ") " ) ")
 				      (if states-qry
-					  (conc (if not-in " AND " " OR ") states-qry " ) ")
+					  (conc (if not-in " AND " " OR ") states-qry ) ;; " ) ")
 					  "")))
 	     (states-statuses-qry 
 	      (cond 
 	       ((and states-qry statuses-qry)
 		(case mode
-		  ((dashboard) interim-qry)
+		  ((dashboard) 
+		   (if not-in
+		       (conc " AND (state='COMPLETED' AND status NOT IN ('" (string-intersperse statuses "','") "')) "
+			     " OR (state != 'COMPLETED' AND state NOT IN ('" (string-intersperse states "','") "')) ")
+		       (conc " AND (state='COMPLETED' AND status IN ('" (string-intersperse statuses "','") "')) "
+			     " OR (state NOT IN ('COMPLETED','DELETED') AND state IN ('" (string-intersperse states "','") "')) ")))
 		  (else       (conc " AND ( " states-qry " AND " statuses-qry " ) "))))
 	       (states-qry  
-		(conc " AND " states-qry))
+		(case mode
+		  ((dashboard) (conc " AND " (if not-in "NOT " "") " state IN ('" (string-intersperse states    "','") "') ")) ;; interim-qry)
+		  (else        (conc " AND " states-qry))))
 	       (statuses-qry 
-		(conc " AND " statuses-qry))
+		(case mode
+		  ((dashboard) (conc " AND " (if not-in "NOT " "") " status IN ('" (string-intersperse statuses "','") "') ")) ;; interim-qry)
+		  (else        (conc " AND " statuses-qry))))
 	       (else "")))
 	     (tests-match-qry (tests:match->sqlqry testpatt))
 	     (qry             (conc "SELECT " qryvalstr
 				    " FROM tests WHERE run_id=? "
 				    (if last-update " " " AND state != 'DELETED' ") ;; if using last-update we want deleted tests?

Index: tests/unittests/basicserver.scm
==================================================================
--- tests/unittests/basicserver.scm
+++ tests/unittests/basicserver.scm
@@ -179,11 +179,11 @@
 ;; ;; (test "launch server" #t (let ((pid (process-fork (lambda ()
 ;; ;; 						    ;; (daemon:ize)
 ;; ;; 						    (server:launch 'http)))))
 ;; ;; 			   (set! server-pid pid)
 ;; ;; 			   (number? pid)))
-;; (system "../../bin/megatest -server - -debug 22 > server.log 2> server.log &")
+;; (system "../../bin/megatest -server - -debugbcom 22 > server.log 2> server.log &")
 ;; 
 ;; (let loop ((n 10))
 ;;   (thread-sleep! 1) ;; need to wait for server to start.
 ;;   (let ((res (open-run-close tasks:get-best-server tasks:open-db)))
 ;;     (print "tasks:get-best-server returned " res)

Index: tests/unittests/tests.scm
==================================================================
--- tests/unittests/tests.scm
+++ tests/unittests/tests.scm
@@ -23,25 +23,58 @@
 (define header  (list "SYSTEM" "RELEASE" "id" "runname" "state" "status" "owner" "event_time"))
 (define run-id  1)
 
 ;; Create a run
 (test #f 1 (rmt:register-run keyvals runname "new" "n/a" user))
-(test #f #t (rmt:general-call 'register-test run-id run-id "test-one" ""))
-(test #f #t (rmt:general-call 'register-test run-id run-id "test-two" ""))
-
-(rmt:test-set-state-status-by-id 
- run-id
- (rmt:get-test-id run-id "test-one" "") "COMPLETED" "FAIL" "")
-(rmt:test-set-state-status-by-id 
- run-id
- (rmt:get-test-id run-id "test-two" "") "COMPLETED" "PASS" "")
-
+(test #f #t (rmt:general-call 'register-test run-id run-id "test-one"   ""))
+(test #f #t (rmt:general-call 'register-test run-id run-id "test-two"   ""))
+(test #f #t (rmt:general-call 'register-test run-id run-id "test-three" ""))
+(test #f #t (rmt:general-call 'register-test run-id run-id "test-four"  ""))
+
+(rmt:test-set-state-status-by-id run-id (rmt:get-test-id run-id "test-one"   "") "COMPLETED" "FAIL" "")
+(rmt:test-set-state-status-by-id run-id (rmt:get-test-id run-id "test-two"   "") "COMPLETED" "PASS" "")
+(rmt:test-set-state-status-by-id run-id (rmt:get-test-id run-id "test-three" "") "RUNNING"   "n/a"  "")
+(rmt:test-set-state-status-by-id run-id (rmt:get-test-id run-id "test-four"  "") "COMPLETED" "WARN" "")
+
+(print "MODE=not in")
+(test #f '()
+      (filter
+       (lambda (y)
+	 (equal? y "FAIL")) ;; any FAIL in the output list?
+       (map 
+	(lambda (x)(vector-ref x 4))
+	(rmt:get-tests-for-run run-id "%/%" '() '("FAIL") #f #f #t 'event_time "DESC" 'shortlist 0 'dashboard))))
+
+(print "MODE=in")
 (test #f '("FAIL")
       (map 
-       (lambda (x)(vector-ref x 4))
-       (rmt:get-tests-for-run run-id "%/%" '() '("FAIL") #f #f #t 'event_time "DESC" 'shortlist 0 'dashboard)))
-(test #f '()
-      (map 
        (lambda (x)(vector-ref x 4))
        (rmt:get-tests-for-run run-id "%/%" '() '("FAIL") #f #f #f 'event_time "DESC" 'shortlist 0 'dashboard)))
+(set! *verbosity* 1)
+
+(print "MODE=in, state in RUNNING")
+;; (set! *verbosity* 8)
+(test #f '("RUNNING")
+      (map 
+       (lambda (x)(vector-ref x 3))
+       (rmt:get-tests-for-run run-id "%/%" '("RUNNING") '() #f #f #f 'event_time "DESC" 'shortlist 0 'dashboard)))
+(set! *verbosity* 1)
+
+(print "MODE=in, state in RUNNING and status IN WARN")
+;; (set! *verbosity* 8)
+(test #f '(("RUNNING" . "n/a") ("COMPLETED" . "WARN"))
+      (map 
+       (lambda (x)
+	 (cons (vector-ref x 3)(vector-ref x 4)))
+       (rmt:get-tests-for-run run-id "%/%" '("RUNNING") '("WARN") #f #f #f 'event_time "DESC" 'shortlist 0 'dashboard)))
+(set! *verbosity* 1)
+
+(print "MODE=not in, state in RUNNING and status IN WARN")
+(set! *verbosity* 8)
+(test #f '(("RUNNING" . "n/a") ("COMPLETED" . "WARN"))
+      (map 
+       (lambda (x)
+	 (cons (vector-ref x 3)(vector-ref x 4)))
+       (rmt:get-tests-for-run run-id "%/%" '("RUNNING") '("WARN") #f #f #t 'event_time "DESC" 'shortlist 0 'dashboard)))
+(set! *verbosity* 1)
 
 (exit)