Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31dac353 authored by Steven Moreland's avatar Steven Moreland
Browse files

dumpsys: '-l' works for 0/1 services. 

Currently, if there are only 0/1 services registered and list is called,
no output will be produced.

Bug: hit me while testing vndservicemanager, since this may not register
    anything
Test: dumpsys_test
Change-Id: I8e16376eb99c5758d53ff0b5f01b32fd21e6b119
parent d6dad7af

cmds/dumpsys/dumpsys.cpp

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ int Dumpsys::main(int argc, char* const argv[]) { 
    }



    const size_t N = services.size();

    if (N > 1) {

    if (N > 1 || showListOnly) {

        // first print a list of the current services

        std::cout << "Currently running services:" << std::endl;

cmds/dumpsys/tests/dumpsys_test.cpp

+16 −4
Original line number Diff line number Diff line
@@ -206,10 +206,7 @@ class DumpsysTest : public Test { 
    }



    void AssertRunningServices(const std::vector<std::string>& services) {

        std::string expected;

        if (services.size() > 1) {

            expected.append("Currently running services:\n");

        }

        std::string expected = "Currently running services:\n";

        for (const std::string& service : services) {

            expected.append("  ").append(service).append("\n");

        }
@@ -263,6 +260,21 @@ TEST_F(DumpsysTest, ListAllServices) { 
    AssertRunningServices({"Locksmith", "Valet"});

}



TEST_F(DumpsysTest, ListServicesOneRegistered) {

    ExpectListServices({"Locksmith"});

    ExpectCheckService("Locksmith");



    CallMain({"-l"});



    AssertRunningServices({"Locksmith"});

}



TEST_F(DumpsysTest, ListServicesEmpty) {

    CallMain({"-l"});



    AssertRunningServices({});

}



// Tests 'dumpsys -l' when a service is not running

TEST_F(DumpsysTest, ListRunningServices) {

    ExpectListServices({"Locksmith", "Valet"});