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

Commit cc887a60 authored by Greg Kaiser's avatar Greg Kaiser Committed by android-build-merger
Browse files

Merge "dumpstate_test: Minor tweak to comments" am: fa7652f2 am: aa5e44f6 am: 9c1dc3fd 

am: e3426d30

Change-Id: I0e0028191758df01f0e0631ecd77baccfc8a8166
parents 88501543 e3426d30

cmds/dumpstate/tests/dumpstate_test.cpp

+6 −3
Original line number Original line Diff line number Diff line
@@ -664,7 +664,8 @@ TEST_F(DumpstateTest, RunCommandNoTitle) { 
TEST_F(DumpstateTest, RunCommandWithTitle) {

TEST_F(DumpstateTest, RunCommandWithTitle) {

    EXPECT_EQ(0, RunCommand("I AM GROOT", {kSimpleCommand}));

    EXPECT_EQ(0, RunCommand("I AM GROOT", {kSimpleCommand}));

    EXPECT_THAT(err, StrEq("stderr\n"));

    EXPECT_THAT(err, StrEq("stderr\n"));

    // We don't know the exact duration, so we check the prefix and suffix

    // The duration may not get output, depending on how long it takes,

    // so we just check the prefix.

    EXPECT_THAT(out,

    EXPECT_THAT(out,

                StartsWith("------ I AM GROOT (" + kSimpleCommand + ") ------\nstdout\n"));

                StartsWith("------ I AM GROOT (" + kSimpleCommand + ") ------\nstdout\n"));

}

}
@@ -699,7 +700,8 @@ TEST_F(DumpstateTest, RunCommandWithMultipleArgs) { 
TEST_F(DumpstateTest, RunCommandDryRun) {

TEST_F(DumpstateTest, RunCommandDryRun) {

    SetDryRun(true);

    SetDryRun(true);

    EXPECT_EQ(0, RunCommand("I AM GROOT", {kSimpleCommand}));

    EXPECT_EQ(0, RunCommand("I AM GROOT", {kSimpleCommand}));

    // We don't know the exact duration, so we check the prefix and suffix

    // The duration may not get output, depending on how long it takes,

    // so we just check the prefix.

    EXPECT_THAT(out, StartsWith("------ I AM GROOT (" + kSimpleCommand +

    EXPECT_THAT(out, StartsWith("------ I AM GROOT (" + kSimpleCommand +

                                ") ------\n\t(skipped on dry run)\n"));

                                ") ------\n\t(skipped on dry run)\n"));

    EXPECT_THAT(err, IsEmpty());

    EXPECT_THAT(err, IsEmpty());
@@ -1037,7 +1039,8 @@ TEST_F(DumpstateTest, DumpFileNotFoundNoTitle) { 
TEST_F(DumpstateTest, DumpFileNotFoundWithTitle) {

TEST_F(DumpstateTest, DumpFileNotFoundWithTitle) {

    EXPECT_EQ(-1, DumpFile("Y U NO EXIST?", "/I/cant/believe/I/exist"));

    EXPECT_EQ(-1, DumpFile("Y U NO EXIST?", "/I/cant/believe/I/exist"));

    EXPECT_THAT(err, IsEmpty());

    EXPECT_THAT(err, IsEmpty());

    // We don't know the exact duration, so we check the prefix and suffix

    // The duration may not get output, depending on how long it takes,

    // so we just check the prefix.

    EXPECT_THAT(out, StartsWith("*** Error dumping /I/cant/believe/I/exist (Y U NO EXIST?): No "

    EXPECT_THAT(out, StartsWith("*** Error dumping /I/cant/believe/I/exist (Y U NO EXIST?): No "

                                "such file or directory\n"));

                                "such file or directory\n"));

}

}