From 219ab33625dd3a24aceec11a7a9ae90df28c7e0c Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Tue, 2 Nov 2021 10:26:01 -0700
Subject: [PATCH] fix regressTest

---
 modules/database/test/std/rec/regressLinkSevr.db |  5 -----
 modules/database/test/std/rec/regressTest.c      | 14 +++++---------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/modules/database/test/std/rec/regressLinkSevr.db b/modules/database/test/std/rec/regressLinkSevr.db
index 387ee7299..607049049 100644
--- a/modules/database/test/std/rec/regressLinkSevr.db
+++ b/modules/database/test/std/rec/regressLinkSevr.db
@@ -15,9 +15,4 @@ record(stringin, "si2") {
 }
 record(longin, "li2") {
   field(INP, "ai.SEVR CA")
-  field(FLNK, "cnt")
-}
-
-record(calc, "cnt") {
-  field(CALC, "VAL+1")
 }
diff --git a/modules/database/test/std/rec/regressTest.c b/modules/database/test/std/rec/regressTest.c
index 95217043d..83dc05a13 100644
--- a/modules/database/test/std/rec/regressTest.c
+++ b/modules/database/test/std/rec/regressTest.c
@@ -171,13 +171,13 @@ void testLongCalc(void)
 static
 void testLinkSevr(void)
 {
-    testMonitor *mon;
     dbChannel *chan;
-    startRegressTestIoc("regressLinkSevr.db");
-    dbCaSync(); /* wait for CA links to connect */
-    dbCaSync(); /* wait for initial update */
 
-    mon = testMonitorCreate("cnt", DBE_VALUE, 0);
+    startRegressTestIoc("regressLinkSevr.db");
+
+    /* wait for CA links to connect and receive an initial update */
+    testdbCaWaitForUpdateCount(dbGetDevLink(testdbRecordPtr("si2")), 1);
+    testdbCaWaitForUpdateCount(dbGetDevLink(testdbRecordPtr("li2")), 1);
 
     chan = dbChannelCreate("ai.SEVR");
     if(!chan)
@@ -196,8 +196,6 @@ void testLinkSevr(void)
     testdbGetFieldEqual("ai.SEVR", DBF_STRING, "INVALID");
 
     testdbPutFieldOk("si1.PROC", DBF_LONG, 1);
-    testMonitorWait(mon);
-    dbCaSync(); /* wait for update */
 
     testdbGetFieldEqual("si1", DBF_STRING, "INVALID");
     testdbGetFieldEqual("li1", DBF_LONG, INVALID_ALARM);
@@ -206,8 +204,6 @@ void testLinkSevr(void)
     testTodoEnd();
     testdbGetFieldEqual("li2", DBF_LONG, INVALID_ALARM);
 
-    testMonitorDestroy(mon);
-
     testIocShutdownOk();
     testdbCleanup();
 }