Merge lp:~carlos-mazieri/ubuntu-filemanager-app/samba-browsing-13-new into lp:ubuntu-filemanager-app

Proposed by Carlos Jose Mazieri on 2015-06-20
Status: Merged
Approved by: Arto Jalkanen on 2015-06-21
Approved revision: 423
Merged at revision: 423
Proposed branch: lp:~carlos-mazieri/ubuntu-filemanager-app/samba-browsing-13-new
Merge into: lp:ubuntu-filemanager-app
Prerequisite: lp:~carlos-mazieri/ubuntu-filemanager-app/samba-browsing-12-new
Diff against target: 18 lines (+9/-1)
1 file modified
src/plugin/test_folderlistmodel/regression/tst_folderlistmodel.cpp (+9/-1)
To merge this branch: bzr merge lp:~carlos-mazieri/ubuntu-filemanager-app/samba-browsing-13-new
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-06-20
Ubuntu File Manager Developers 2015-06-20 Pending
Review via email: mp+262525@code.launchpad.net

Commit message

Integrated Samba tests.

Description of the change

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/plugin/test_folderlistmodel/regression/tst_folderlistmodel.cpp'
2--- src/plugin/test_folderlistmodel/regression/tst_folderlistmodel.cpp 2015-06-20 19:00:12 +0000
3+++ src/plugin/test_folderlistmodel/regression/tst_folderlistmodel.cpp 2015-06-20 19:00:12 +0000
4@@ -2991,7 +2991,15 @@
5 break;
6 }
7 }
8- return QTest::qExec(&tc, args);
9+ int ret = QTest::qExec(&tc, args);
10+ //if not running specific tests, run Samba test suite
11+ if (args.count() == 1)
12+ {
13+ printf("\n********* Samba tests ********\n");
14+ TestQSambaSuite smbTest;
15+ ret |= QTest::qExec(&smbTest, args);
16+ }
17+ return ret;
18 }
19
20

Subscribers

People subscribed via source and target branches