ubuntu-touch-coreapps-reviewers team mailing list archive

[Carlos Jose Mazieri <carlos.mazieri@xxxxxxxxx>]

Carlos Jose Mazieri has proposed merging lp:~carlos-mazieri/ubuntu-filemanager-app/samba-browsing-13-new into lp:ubuntu-filemanager-app with lp:~carlos-mazieri/ubuntu-filemanager-app/samba-browsing-12-new as a prerequisite.

Commit message:
Integrated Samba tests.

Requested reviews:
  Ubuntu File Manager Developers (ubuntu-filemanager-dev)

For more details, see:
https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/samba-browsing-13-new/+merge/262525

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

Integrated Samba tests.
-- 
Your team Ubuntu File Manager Developers is requested to review the proposed merge of lp:~carlos-mazieri/ubuntu-filemanager-app/samba-browsing-13-new into lp:ubuntu-filemanager-app.

=== 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;
 }