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

[Carlos Jose Mazieri]

Integrated Samba tests.

It replaces the Mp https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/samba-browsing-13/+merge/253130

Integrated Samba tests.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:423
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/498/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2967
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2967/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/214
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/120

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/498/rebuild

review: Approve (continuous-integration)

=== modified file 'src/plugin/test_folderlistmodel/regression/tst_folderlistmodel.cpp'
--- src/plugin/test_folderlistmodel/regression/tst_folderlistmodel.cpp	2015-06-20 19:00:12 +0000
+++ src/plugin/test_folderlistmodel/regression/tst_folderlistmodel.cpp	2015-06-20 19:00:12 +0000
@@ -2991,7 +2991,15 @@
           break;
        }
     }
-    return  QTest::qExec(&tc, args);
+    int ret =  QTest::qExec(&tc, args);
+    //if not running specific tests, run Samba test suite
+    if (args.count() == 1)
+    {
+        printf("\n********* Samba tests ********\n");
+        TestQSambaSuite smbTest;
+        ret |= QTest::qExec(&smbTest, args);
+    }
+    return ret;
 }