Merge lp:~dobey/unity-scope-click/skip-broken into lp:unity-scope-click/devel

[dobey]

Log corrupt packages and try to continue, rather than throwing for click list.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:405
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/275/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/250
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/249
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/249/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/249

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/275/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:409
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/287/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/262
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/261
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/261/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/261

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/287/rebuild

review: Approve (continuous-integration)

[lp:~dobey/unity-scope-click/skip-broken]

410. By dobey on 2014-08-26

Remove superfluous .data() usage.

411. By dobey on 2014-08-26

Remove more superfluous data calls.

412. By dobey on 2014-08-26

Use {} instead of () for the initalizers.

[Alejandro J. Cura (alecu)]

Works much better.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:411
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/289/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/264
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/263
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/263/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/263

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/289/rebuild

review: Approve (continuous-integration)

=== modified file 'libclickscope/click/interface.cpp'
--- libclickscope/click/interface.cpp	2014-08-08 08:47:23 +0000
+++ libclickscope/click/interface.cpp	2014-08-26 14:57:24 +0000
@@ -498,13 +498,22 @@
     PackageSet installed_packages;
 
     while (iss.peek() != EOF) {
-        Package p;
-        std::getline(iss, p.name, TAB);
-        std::getline(iss, p.version, NEWLINE);
-        if (iss.eof() || p.name.empty() || p.version.empty()) {
-            throw std::runtime_error("Error encountered parsing 'click list' output");
+        std::string line;
+        std::getline(iss, line, NEWLINE);
+
+        if (!line.empty()) {
+            // Must initialize linestream after line is filled.
+            std::istringstream linestream(line);
+
+            Package p;
+            std::getline(linestream, p.name, TAB);
+            std::getline(linestream, p.version);
+            if (iss.eof() || p.name.empty() || p.version.empty()) {
+                qWarning() << "Error encountered parsing 'click list' output:" << QString::fromStdString(line);
+            } else {
+                installed_packages.insert(p);
+            }
         }
-        installed_packages.insert(p);
     }
 
     return installed_packages;
@@ -587,8 +596,8 @@
                      static_cast<QProcessFinished>(&QProcess::finished),
                      [callback, process](int code, QProcess::ExitStatus /*status*/) {
                          qDebug() << "command finished with exit code:" << code;
-                         auto data = process.data()->readAllStandardOutput().data();
-                         auto errors = process.data()->readAllStandardError().data();
+                         std::string data{process->readAllStandardOutput().data()};
+                         std::string errors{process->readAllStandardError().data()};
                          callback(code, data, errors);
                      } );
 
@@ -596,9 +605,9 @@
                      static_cast<QProcessError>(&QProcess::error),
                      [callback, process](QProcess::ProcessError error) {
                          qCritical() << "error running command:" << error;
-                         auto data = process.data()->readAllStandardOutput().data();
-                         auto errors = process.data()->readAllStandardError().data();
-                         callback(process.data()->exitCode(), data, errors);
+                         std::string data{process->readAllStandardOutput().data()};
+                         std::string errors{process->readAllStandardError().data()};
+                         callback(process->exitCode(), data, errors);
                      } );
 
     process->start(command.c_str());

=== modified file 'libclickscope/tests/test_interface.cpp'
--- libclickscope/tests/test_interface.cpp	2014-08-05 14:16:26 +0000
+++ libclickscope/tests/test_interface.cpp	2014-08-26 14:57:24 +0000
@@ -687,16 +687,20 @@
 TEST_F(ClickInterfaceTest, testGetInstalledPackagesParseError)
 {
     FakeClickInterface iface;
+    std::string bad_stdout = "INVALID: err\nvalid.package\t1.0\n";
+    PackageSet expected{{"valid.package", "1.0"}};
+
     EXPECT_CALL(iface, run_process(_, _)).
         Times(1).
         WillOnce(Invoke([&](const std::string&,
                             std::function<void(int, const std::string&,
                                                const std::string&)> callback){
-                            callback(0, "valid.package\t1.0\nINVALID LINE", "");
+                            callback(0, bad_stdout, "");
                         }));
-    EXPECT_CALL(*this, installed_callback(_, InterfaceError::ParseError));
-    iface.get_installed_packages([this](PackageSet package_names, InterfaceError error){
+    EXPECT_CALL(*this, installed_callback(_, InterfaceError::NoError));
+    iface.get_installed_packages([this, expected](PackageSet package_names, InterfaceError error){
             installed_callback(package_names, error);
+            ASSERT_EQ(package_names, expected);
         });
 }