1
=== modified file 'libclickscope/click/interface.cpp'
2
--- libclickscope/click/interface.cpp	2014-08-08 08:47:23 +0000
3
+++ libclickscope/click/interface.cpp	2014-08-26 14:57:24 +0000
4
@@ -498,13 +498,22 @@
5
498
    PackageSet installed_packages;
498
    PackageSet installed_packages;
6
499
499
7
500
    while (iss.peek() != EOF) {
500
    while (iss.peek() != EOF) {
13
501
        Package p;
501
        std::string line;
14
502
        std::getline(iss, p.name, TAB);
502
        std::getline(iss, line, NEWLINE);
15
503
        std::getline(iss, p.version, NEWLINE);
503
16
504
        if (iss.eof() || p.name.empty() || p.version.empty()) {
504
        if (!line.empty()) {
17
505
            throw std::runtime_error("Error encountered parsing 'click list' output");
505
            // Must initialize linestream after line is filled.
18
506
            std::istringstream linestream(line);
19
507
20
508
            Package p;
21
509
            std::getline(linestream, p.name, TAB);
22
510
            std::getline(linestream, p.version);
23
511
            if (iss.eof() || p.name.empty() || p.version.empty()) {
24
512
                qWarning() << "Error encountered parsing 'click list' output:" << QString::fromStdString(line);
25
513
            } else {
26
514
                installed_packages.insert(p);
27
515
            }
28
506
        }
516
        }
29
507
        installed_packages.insert(p);
30
508
    }
517
    }
31
509
518
32
510
    return installed_packages;
519
    return installed_packages;
33
@@ -587,8 +596,8 @@
34
587
                     static_cast<QProcessFinished>(&QProcess::finished),
596
                     static_cast<QProcessFinished>(&QProcess::finished),
35
588
                     [callback, process](int code, QProcess::ExitStatus /*status*/) {
597
                     [callback, process](int code, QProcess::ExitStatus /*status*/) {
36
589
                         qDebug() << "command finished with exit code:" << code;
598
                         qDebug() << "command finished with exit code:" << code;
39
590
                         auto data = process.data()->readAllStandardOutput().data();
599
                         std::string data{process->readAllStandardOutput().data()};
40
591
                         auto errors = process.data()->readAllStandardError().data();
600
                         std::string errors{process->readAllStandardError().data()};
41
592
                         callback(code, data, errors);
601
                         callback(code, data, errors);
42
593
                     } );
602
                     } );
43
594
603
44
@@ -596,9 +605,9 @@
45
596
                     static_cast<QProcessError>(&QProcess::error),
605
                     static_cast<QProcessError>(&QProcess::error),
46
597
                     [callback, process](QProcess::ProcessError error) {
606
                     [callback, process](QProcess::ProcessError error) {
47
598
                         qCritical() << "error running command:" << error;
607
                         qCritical() << "error running command:" << error;
51
599
                         auto data = process.data()->readAllStandardOutput().data();
608
                         std::string data{process->readAllStandardOutput().data()};
52
600
                         auto errors = process.data()->readAllStandardError().data();
609
                         std::string errors{process->readAllStandardError().data()};
53
601
                         callback(process.data()->exitCode(), data, errors);
610
                         callback(process->exitCode(), data, errors);
54
602
                     } );
611
                     } );
55
603
612
56
604
    process->start(command.c_str());
613
    process->start(command.c_str());
57
605
614
58
=== modified file 'libclickscope/tests/test_interface.cpp'
59
--- libclickscope/tests/test_interface.cpp	2014-08-05 14:16:26 +0000
60
+++ libclickscope/tests/test_interface.cpp	2014-08-26 14:57:24 +0000
61
@@ -687,16 +687,20 @@
62
687
TEST_F(ClickInterfaceTest, testGetInstalledPackagesParseError)
687
TEST_F(ClickInterfaceTest, testGetInstalledPackagesParseError)
63
688
{
688
{
64
689
    FakeClickInterface iface;
689
    FakeClickInterface iface;
65
690
    std::string bad_stdout = "INVALID: err\nvalid.package\t1.0\n";
66
691
    PackageSet expected{{"valid.package", "1.0"}};
67
692
68
690
    EXPECT_CALL(iface, run_process(_, _)).
693
    EXPECT_CALL(iface, run_process(_, _)).
69
691
        Times(1).
694
        Times(1).
70
692
        WillOnce(Invoke([&](const std::string&,
695
        WillOnce(Invoke([&](const std::string&,
71
693
                            std::function<void(int, const std::string&,
696
                            std::function<void(int, const std::string&,
72
694
                                               const std::string&)> callback){
697
                                               const std::string&)> callback){
74
695
                            callback(0, "valid.package\t1.0\nINVALID LINE", "");
698
                            callback(0, bad_stdout, "");
75
696
                        }));
699
                        }));
78
697
    EXPECT_CALL(*this, installed_callback(_, InterfaceError::ParseError));
700
    EXPECT_CALL(*this, installed_callback(_, InterfaceError::NoError));
79
698
    iface.get_installed_packages([this](PackageSet package_names, InterfaceError error){
701
    iface.get_installed_packages([this, expected](PackageSet package_names, InterfaceError error){
80
699
            installed_callback(package_names, error);
702
            installed_callback(package_names, error);
81
703
            ASSERT_EQ(package_names, expected);
82
700
        });
704
        });
83
701
}
705
}
84
702
706
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-08-26
Alejandro J. Cura (community)		2014-08-18	Approve on 2014-08-26
Review via email: mp+231267@code.launchpad.net
1	=== modified file 'libclickscope/click/interface.cpp'
2	--- libclickscope/click/interface.cpp 2014-08-08 08:47:23 +0000
3	+++ libclickscope/click/interface.cpp 2014-08-26 14:57:24 +0000
4	@@ -498,13 +498,22 @@
5	498	PackageSet installed_packages;	498	PackageSet installed_packages;
6	499		499
7	500	while (iss.peek() != EOF) {	500	while (iss.peek() != EOF) {
13	501	Package p;	501	std::string line;
14	502	std::getline(iss, p.name, TAB);	502	std::getline(iss, line, NEWLINE);
15	503	std::getline(iss, p.version, NEWLINE);	503
16	504	if (iss.eof() \|\| p.name.empty() \|\| p.version.empty()) {	504	if (!line.empty()) {
17	505	throw std::runtime_error("Error encountered parsing 'click list' output");	505	// Must initialize linestream after line is filled.
18			506	std::istringstream linestream(line);
19			507
20			508	Package p;
21			509	std::getline(linestream, p.name, TAB);
22			510	std::getline(linestream, p.version);
23			511	if (iss.eof() \|\| p.name.empty() \|\| p.version.empty()) {
24			512	qWarning() << "Error encountered parsing 'click list' output:" << QString::fromStdString(line);
25			513	} else {
26			514	installed_packages.insert(p);
27			515	}
28	506	}	516	}
29	507	installed_packages.insert(p);
30	508	}	517	}
31	509		518
32	510	return installed_packages;	519	return installed_packages;
33	@@ -587,8 +596,8 @@
34	587	static_cast<QProcessFinished>(&QProcess::finished),	596	static_cast<QProcessFinished>(&QProcess::finished),
35	588	[callback, process](int code, QProcess::ExitStatus /status/) {	597	[callback, process](int code, QProcess::ExitStatus /status/) {
36	589	qDebug() << "command finished with exit code:" << code;	598	qDebug() << "command finished with exit code:" << code;
39	590	auto data = process.data()->readAllStandardOutput().data();	599	std::string data{process->readAllStandardOutput().data()};
40	591	auto errors = process.data()->readAllStandardError().data();	600	std::string errors{process->readAllStandardError().data()};
41	592	callback(code, data, errors);	601	callback(code, data, errors);
42	593	} );	602	} );
43	594		603
44	@@ -596,9 +605,9 @@
45	596	static_cast<QProcessError>(&QProcess::error),	605	static_cast<QProcessError>(&QProcess::error),
46	597	[callback, process](QProcess::ProcessError error) {	606	[callback, process](QProcess::ProcessError error) {
47	598	qCritical() << "error running command:" << error;	607	qCritical() << "error running command:" << error;
51	599	auto data = process.data()->readAllStandardOutput().data();	608	std::string data{process->readAllStandardOutput().data()};
52	600	auto errors = process.data()->readAllStandardError().data();	609	std::string errors{process->readAllStandardError().data()};
53	601	callback(process.data()->exitCode(), data, errors);	610	callback(process->exitCode(), data, errors);
54	602	} );	611	} );
55	603		612
56	604	process->start(command.c_str());	613	process->start(command.c_str());
57	605		614
58	=== modified file 'libclickscope/tests/test_interface.cpp'
59	--- libclickscope/tests/test_interface.cpp 2014-08-05 14:16:26 +0000
60	+++ libclickscope/tests/test_interface.cpp 2014-08-26 14:57:24 +0000
61	@@ -687,16 +687,20 @@
62	687	TEST_F(ClickInterfaceTest, testGetInstalledPackagesParseError)	687	TEST_F(ClickInterfaceTest, testGetInstalledPackagesParseError)
63	688	{	688	{
64	689	FakeClickInterface iface;	689	FakeClickInterface iface;
65			690	std::string bad_stdout = "INVALID: err\nvalid.package\t1.0\n";
66			691	PackageSet expected{{"valid.package", "1.0"}};
67			692
68	690	EXPECT_CALL(iface, run_process(_, _)).	693	EXPECT_CALL(iface, run_process(_, _)).
69	691	Times(1).	694	Times(1).
70	692	WillOnce(Invoke([&](const std::string&,	695	WillOnce(Invoke([&](const std::string&,
71	693	std::function<void(int, const std::string&,	696	std::function<void(int, const std::string&,
72	694	const std::string&)> callback){	697	const std::string&)> callback){
74	695	callback(0, "valid.package\t1.0\nINVALID LINE", "");	698	callback(0, bad_stdout, "");
75	696	}));	699	}));
78	697	EXPECT_CALL(*this, installed_callback(_, InterfaceError::ParseError));	700	EXPECT_CALL(*this, installed_callback(_, InterfaceError::NoError));
79	698	iface.get_installed_packages([this](PackageSet package_names, InterfaceError error){	701	iface.get_installed_packages([this, expected](PackageSet package_names, InterfaceError error){
80	699	installed_callback(package_names, error);	702	installed_callback(package_names, error);
81			703	ASSERT_EQ(package_names, expected);
82	700	});	704	});
83	701	}	705	}
84	702		706