This repository was archived by the owner on Mar 4, 2023. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +9
-11
lines changed
tests/auto/datasync/WsRemoteConnectorTest Expand file tree Collapse file tree 2 files changed +9
-11
lines changed Original file line number Diff line number Diff line change @@ -26,5 +26,7 @@ DEFINES += BUILDDIR=\\\"$$OUT_PWD/\\\"
2626
2727HEADERS +=
2828
29+ DISTFILES += server-setup.conf
30+
2931include (setup.pri )
3032DEFINES += SETUP_CONF =\ \\"$$SETUP_FILE\\\"
Original file line number Diff line number Diff line change @@ -58,12 +58,10 @@ void WsRemoteConnectorTest::initTestCase()
5858 auth = Setup::authenticatorForSetup<WsAuthenticator>(this );
5959
6060 // now start the server!
61- QProcess p;
62- p.start (QStringLiteral (" %1/../../../../bin/qdatasyncserver start -c %2" )
63- .arg (BUILDDIR)
64- .arg (SETUP_CONF));
65- QVERIFY2 (p.waitForFinished (), qPrintable (p.errorString ()));
66- QCOMPARE (p.exitCode (), EXIT_SUCCESS);
61+ auto res = QProcess::execute (QStringLiteral (" %1/../../../../bin/qdatasyncserver start -c %2" )
62+ .arg (BUILDDIR)
63+ .arg (SETUP_CONF));
64+ QCOMPARE (res, EXIT_SUCCESS);
6765}
6866
6967void WsRemoteConnectorTest::cleanupTestCase ()
@@ -74,11 +72,9 @@ void WsRemoteConnectorTest::cleanupTestCase()
7472 Setup::removeSetup (Setup::DefaultSetup);
7573
7674 // and stop the server!
77- QProcess p;
78- p.start (QStringLiteral (" %1/../../../../bin/qdatasyncserver stop" )
79- .arg (BUILDDIR));
80- QVERIFY2 (p.waitForFinished (), qPrintable (p.errorString ()));
81- QCOMPARE (p.exitCode (), EXIT_SUCCESS);
75+ auto res = QProcess::execute (QStringLiteral (" %1/../../../../bin/qdatasyncserver stop" )
76+ .arg (BUILDDIR));
77+ QCOMPARE (res, EXIT_SUCCESS);
8278}
8379
8480void WsRemoteConnectorTest::testServerConnecting ()
You can’t perform that action at this time.
0 commit comments