summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qtimezoneprivate.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-06-10 14:01:37 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-06-10 12:50:12 +0000
commit898ce1dcf5175edf383dfa0670e4840255cc5e5a (patch)
treebc188f6f73a5def69cfa085afba67f615b06597e /src/corelib/tools/qtimezoneprivate.cpp
parent9545bee98a2431d4ef4c3449631a5fcb8d9bd57a (diff)
networkselftest: Fix handling of the smbclient process.
When the server could not be reached, the test previously, produced: FAIL! : tst_NetworkSelfTest::smbServer() 'smbclient.waitForFinished(5000)' returned FALSE. () - Loc: [tst_networkselftest.cpp(992)] QWARN : tst_NetworkSelfTest::smbServer() QProcess: Destroyed while process ("smbclient") is still running. Fix this by: - Using QStandardPaths::findExecutable to locate the binary instead of test-wise starting it. - Add a function to ensure process termination. - Pass a timeout argument to smbclient and pass an interval depending on it to waitForFinished(), which should prevent having to kill the process in most cases. - Add proper error message Change-Id: I1cbc76ca69aec7d1e0e880685bed54b0ba7f21c7 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/corelib/tools/qtimezoneprivate.cpp')
0 files changed, 0 insertions, 0 deletions