summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@nokia.com>2010-04-21 06:09:36 (GMT)
committerMorten Johan Sørvig <morten.sorvig@nokia.com>2010-04-21 06:09:36 (GMT)
commit4c4f726a91e9177ad6840c80a347f73932eda844 (patch)
tree92d1b487ccfb0a727caf62830ae81552dc899320 /tests
parente46aeaf529be4598d809417e74ac09de4170465f (diff)
downloadQt-4c4f726a91e9177ad6840c80a347f73932eda844.zip
Qt-4c4f726a91e9177ad6840c80a347f73932eda844.tar.gz
Qt-4c4f726a91e9177ad6840c80a347f73932eda844.tar.bz2
Revert "Report the error as being AlreadyExists if this is why it fails"
This reverts commit 73a1291a3f097787f00d79d0d27bd75219bf8e3d. Test failures: qsystemsemaphore::key (unix platforms) All of qsharedmemory (unix, windows)
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp25
1 files changed, 0 insertions, 25 deletions
diff --git a/tests/auto/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp b/tests/auto/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp
index 0dc9c99..eb82fd4 100644
--- a/tests/auto/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp
+++ b/tests/auto/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp
@@ -76,8 +76,6 @@ private slots:
void undo();
void initialValue();
- void exists();
-
private:
QSystemSemaphore *existingLock;
@@ -299,29 +297,6 @@ void tst_QSystemSemaphore::initialValue()
release.waitForFinished(LACKYWAITTIME);
QVERIFY(acquire.state()== QProcess::NotRunning);
}
-
-void tst_QSystemSemaphore::exists()
-{
- QSystemSemaphore sem("store", 1, QSystemSemaphore::Create);
- QVERIFY(sem.error() == QSystemSemaphore::NoError);
- QVERIFY(sem.acquire());
- QVERIFY(sem.error() == QSystemSemaphore::NoError);
-
- {
- QSystemSemaphore dupSem("store", 1, QSystemSemaphore::Create);
- QVERIFY(dupSem.error() == QSystemSemaphore::AlreadyExists);
- }
-#ifndef Q_OS_UNIX
- // The rest of the test does not make sense on Unix because open will
- // actually succeed anyway (see QSystemSemaphore docs)
- QSystemSemaphore anotherSem("store", 1, QSystemSemaphore::Open);
- QVERIFY(anotherSem.error() == QSystemSemaphore::AlreadyExists);
- QVERIFY(sem.release());
- QVERIFY(anotherSem.acquire());
- QVERIFY(anotherSem.release());
-#endif
-}
-
QTEST_MAIN(tst_QSystemSemaphore)
#include "tst_qsystemsemaphore.moc"