tests/unit-test-client.c: revise test case "Adapted byte timeout (Xms > Yms)" to increase the timeouts and fit all laggy systems better

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

Author: jimklimov

tests/unit-test-client.c

@@ -739,33 +739,42 @@ int main(int argc, char *argv[])
         usleep(1000000);
         modbus_flush(ctx);
 
-#if defined(_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);
-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
-        /* For some reason, FreeBSD 12 and OpenBSD 6.5 also
-         * tended to fail with 7ms and even 33ms variants
-         * as "gmake check", but passed in
-         * gmake -j 8 && ( ./tests/unit-test-server|cat & sleep 1 ; ./tests/unit-test-client|cat )
-         * An even longer timeout seems to satisfy all of them.
-         */
-        TEST_TITLE("2/2 Adapted byte timeout (66ms > 20ms)");
-        modbus_set_byte_timeout(ctx, 0, 66000);
-        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)");
+        TEST_TITLE("2/2-A 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);
+        if (rc == 1) {
+            ASSERT_TRUE(rc == 1, "FAILED (rc: %d != 1)", rc);
+        } else {
+            /* Timeout of 20ms between bytes, allow for 2*16+1
+             * Windows sleep seems to be at least 15ms always.
+             */
+            usleep(1000000);
+            modbus_flush(ctx);
+            TEST_TITLE("2/2-B 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);
+
+            if (rc == 1) {
+                ASSERT_TRUE(rc == 1, "FAILED (rc: %d != 1)", rc);
+            } else {
+                /* For some reason, FreeBSD 12 and OpenBSD 6.5 also
+                 * tended to fail with 7ms and even 33ms variants
+                 * as "gmake check", but passed in
+                 * gmake -j 8 && ( ./tests/unit-test-server|cat & sleep 1 ; ./tests/unit-test-client|cat )
+                 * An even longer timeout seems to satisfy all of them.
+                 */
+                usleep(1000000);
+                modbus_flush(ctx);
+                TEST_TITLE("2/2-C Adapted byte timeout (66ms > 20ms)");
+                modbus_set_byte_timeout(ctx, 0, 66000);
+                rc = modbus_read_registers(
+                    ctx, UT_REGISTERS_ADDRESS_BYTE_SLEEP_20_MS, 1, tab_rp_registers);
+                ASSERT_TRUE(rc == 1, "FAILED (rc: %d != 1)", rc);
+            }
+        }
     }
 
     /* Restore original byte timeout */