1 files changed, 3 insertions, 23 deletions
diff --git a/tests/auto/qobjectrace/tst_qobjectrace.cpp b/tests/auto/qobjectrace/tst_qobjectrace.cpp
index 1f52aecf8c..8cb7845e78 100644
--- a/tests/auto/qobjectrace/tst_qobjectrace.cpp
+++ b/tests/auto/qobjectrace/tst_qobjectrace.cpp
@@ -45,9 +45,7 @@
 
 
 enum { OneMinute = 60 * 1000,
-       TwoMinutes = OneMinute * 2,
-       TenMinutes = OneMinute * 10,
-       TwentyFiveMinutes = OneMinute * 25 };
+       TwoMinutes = OneMinute * 2 };
 
 class tst_QObjectRace: public QObject
 {
@@ -139,11 +137,6 @@ private slots:
 
 void tst_QObjectRace::moveToThreadRace()
 {
-#if defined(Q_OS_SYMBIAN)
-    // ### FIXME: task 257411 - remove xfail once this is fixed
-    QEXPECT_FAIL("", "Symbian event dispatcher can't handle this kind of race, see task: 257411", Abort);
-    QVERIFY(false);
-#endif
     RaceObject *object = new RaceObject;
 
     enum { ThreadCount = 6 };
@@ -218,24 +211,11 @@ public:
     }
 };
 
-#if defined(Q_OS_SYMBIAN)
-// Symbian needs "a bit" more time
-# define EXTRA_THREAD_WAIT TenMinutes
-# define MAIN_THREAD_WAIT TwentyFiveMinutes
-#else
-# define EXTRA_THREAD_WAIT 3000
-# define MAIN_THREAD_WAIT TwoMinutes
-#endif
+#define EXTRA_THREAD_WAIT 3000
+#define MAIN_THREAD_WAIT TwoMinutes
 
 void tst_QObjectRace::destroyRace()
 {
-#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86)
-    // ### FIXME: task 257411 - remove xfail once this is fixed.
-	// Oddly enough, this seems to work properly in HW, if given enough time and memory.
-    QEXPECT_FAIL("", "Symbian event dispatcher can't handle this kind of race on emulator, see task: 257411", Abort);
-    QVERIFY(false);
-#endif
-
     enum { ThreadCount = 10, ObjectCountPerThread = 733,
            ObjectCount = ThreadCount * ObjectCountPerThread };