tests/unit-test-client.c: on WIN32 replace "7ms > 5ms" test case with "33ms > 20ms"

Signed-off-by: Jim Klimov <[email protected]>

Author: jimklimov

tests/unit-test-client.c

@@ -738,11 +738,21 @@ int main(int argc, char *argv[])
         usleep(1000000);
         modbus_flush(ctx);
 
+#ifdef _WIN32
+        /* Timeout of 20ms between bytes, allow for 2*16+1
+         * Windows sleep seems to be at least 15ms always
+         */
+        TEST_TITLE("2/2 Adapted byte timeout (33ms > 20ms)");
+        modbus_set_byte_timeout(ctx, 0, 33000);
+        rc = modbus_read_registers(
+            ctx, UT_REGISTERS_ADDRESS_BYTE_SLEEP_20_MS, 1, tab_rp_registers);
+#else
         /* Timeout of 7ms between bytes */
         TEST_TITLE("2/2 Adapted byte timeout (7ms > 5ms)");
         modbus_set_byte_timeout(ctx, 0, 7000);
         rc = modbus_read_registers(
             ctx, UT_REGISTERS_ADDRESS_BYTE_SLEEP_5_MS, 1, tab_rp_registers);
+#endif
         ASSERT_TRUE(rc == 1, "FAILED (rc: %d != 1)", rc);
     }
 

tests/unit-test-server.c

@@ -221,7 +221,7 @@ int main(int argc, char *argv[])
             } else if (address == UT_REGISTERS_ADDRESS_SLEEP_500_MS) {
                 printf("Sleep 0.5 s before replying\n");
                 usleep(500000);
-            } else if (address == UT_REGISTERS_ADDRESS_BYTE_SLEEP_5_MS) {
+            } else if (address == UT_REGISTERS_ADDRESS_BYTE_SLEEP_5_MS || address == UT_REGISTERS_ADDRESS_BYTE_SLEEP_20_MS) {
                 /* Test low level only available in TCP mode */
                 /* Catch the reply and send reply byte a byte */
                 uint8_t req[] = "\x00\x1C\x00\x00\x00\x05\xFF\x03\x02\x00\x00";
@@ -236,7 +236,11 @@ int main(int argc, char *argv[])
                 req[1] = query[1];
                 for (i = 0; i < req_length; i++) {
                     printf("(%.2X)", req[i]);
-                    usleep(5000);
+                    if (address == UT_REGISTERS_ADDRESS_BYTE_SLEEP_5_MS) {
+                        usleep(5000);
+                    } else if (address == UT_REGISTERS_ADDRESS_BYTE_SLEEP_20_MS) {
+                        usleep(20000);
+                    }
                     rc = send(w_s, (const char *) (req + i), 1, MSG_NOSIGNAL);
                     if (rc == -1) {
                         break;

tests/unit-test.h.in

@@ -47,8 +47,11 @@ const uint16_t UT_REGISTERS_ADDRESS_SPECIAL = 0x170;
 const uint16_t UT_REGISTERS_ADDRESS_INVALID_TID_OR_SLAVE = 0x171;
 /* The server will wait for 1 second before replying to test timeout */
 const uint16_t UT_REGISTERS_ADDRESS_SLEEP_500_MS = 0x172;
-/* The server will wait for 5 ms before sending each byte */
+/* The server will wait for 5 ms before sending each byte
+ * WARNING: this may be too short for WIN32 */
 const uint16_t UT_REGISTERS_ADDRESS_BYTE_SLEEP_5_MS = 0x173;
+/* The server will wait for 20 ms before sending each byte */
+const uint16_t UT_REGISTERS_ADDRESS_BYTE_SLEEP_20_MS = 0x174;
 
 /* If the following value is used, a bad response is sent.
    It's better to test with a lower value than