summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/bearer/qbearertestcommon.h
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/network/bearer/qbearertestcommon.h')
-rw-r--r--tests/auto/network/bearer/qbearertestcommon.h18
1 files changed, 4 insertions, 14 deletions
diff --git a/tests/auto/network/bearer/qbearertestcommon.h b/tests/auto/network/bearer/qbearertestcommon.h
index 4b73b51d15..6279dbb1ef 100644
--- a/tests/auto/network/bearer/qbearertestcommon.h
+++ b/tests/auto/network/bearer/qbearertestcommon.h
@@ -42,6 +42,10 @@
#ifndef QBEARERTESTCOMMON_H
#define QBEARERTESTCOMMON_H
+#include <QtTest/qtestcase.h>
+
+enum { TestTimeOut = 90000 };
+
// Wait for __expr to happen, while still allowing events to be processed.
#define QTRY_NOOP(__expr) \
do { \
@@ -55,18 +59,4 @@
} \
} while(0)
-// Will try to wait for the condition while allowing event processing
-#define QTRY_VERIFY(__expr) \
- do { \
- const int __step = 50; \
- const int __timeout = 90000; \
- if (!(__expr)) { \
- QTest::qWait(0); \
- } \
- for (int __i = 0; __i < __timeout && !(__expr); __i+=__step) { \
- QTest::qWait(__step); \
- } \
- QVERIFY(__expr); \
- } while(0)
-
#endif