ソースを参照

try fix sub test

StalderT 7 年 前
コミット
1b92ebcb7b
共有1 個のファイルを変更した2 個の追加10 個の削除を含む
  1. 2 10
      tests/client/check_client_subscriptions.c

+ 2 - 10
tests/client/check_client_subscriptions.c

@@ -33,7 +33,7 @@ static void setup(void) {
     running = UA_Boolean_new();
     *running = true;
     config = UA_ServerConfig_new_default();
-    config->maxPublishReqPerSession = 8;
+    config->maxPublishReqPerSession = 5;
     server = UA_Server_new(config);
     UA_Server_run_startup(server);
     THREAD_CREATE(server_thread, serverloop);
@@ -61,14 +61,6 @@ dataChangeHandler(UA_Client *client, UA_UInt32 subId, void *subContext,
     countNotificationReceived++;
 }
 
-static void
-dataChangeHandlerSubSleep(UA_Client *client, UA_UInt32 subId, void *subContext,
-                          UA_UInt32 monId, void *monContext, UA_DataValue *value) {
-    notificationReceived = true;
-    countNotificationReceived++;
-    UA_fakeSleep((UA_UInt32)(publishingInterval + 2));
-}
-
 START_TEST(Client_subscription) {
     UA_Client *client = UA_Client_new(UA_ClientConfig_default);
     UA_StatusCode retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
@@ -387,7 +379,7 @@ stateCallback (UA_Client *client, UA_ClientState clientState){
         UA_MonitoredItemCreateResult monResponse =
             UA_Client_MonitoredItems_createDataChange(client, response.subscriptionId,
                                                       UA_TIMESTAMPSTORETURN_BOTH,
-                                                      monRequest, NULL, dataChangeHandlerSubSleep, NULL);
+                                                      monRequest, NULL, dataChangeHandler, NULL);
         ck_assert_uint_eq(monResponse.statusCode, UA_STATUSCODE_GOOD);
         UA_UInt32 monId = monResponse.monitoredItemId;