Fix RestartSystemServerTargetPreparer by trimming output

getprop result can contain whitespace, so trim it.

Test: run_tradefed_tests.sh
Change-Id: I0f97dad60128b96e9059f357ea604969db3f2475

2 files changed, 16 insertions, 1 deletions

diff --git a/src/com/android/tradefed/targetprep/RestartSystemServerTargetPreparer.java b/src/com/android/tradefed/targetprep/RestartSystemServerTargetPreparer.java
index 11d7fba..e4bb872 100644
--- a/src/com/android/tradefed/targetprep/RestartSystemServerTargetPreparer.java
+++ b/src/com/android/tradefed/targetprep/RestartSystemServerTargetPreparer.java
@@ -50,7 +50,7 @@ public class RestartSystemServerTargetPreparer implements ITargetPreparer {
         device.executeShellCommand("kill " + pid);
         boolean success = false;
         for (int tries = 0; tries < mMaxTries; ++tries) {
-            if (device.executeShellCommand("getprop sys.boot_completed").equals("1")) {
+            if (device.executeShellCommand("getprop sys.boot_completed").trim().equals("1")) {
                 success = true;
                 break;
             }
diff --git a/tests/src/com/android/tradefed/targetprep/RestartSystemServerTargetPreparerTest.java b/tests/src/com/android/tradefed/targetprep/RestartSystemServerTargetPreparerTest.java
index 975252e..c76f109 100644
--- a/tests/src/com/android/tradefed/targetprep/RestartSystemServerTargetPreparerTest.java
+++ b/tests/src/com/android/tradefed/targetprep/RestartSystemServerTargetPreparerTest.java
@@ -61,6 +61,21 @@ public class RestartSystemServerTargetPreparerTest {
     }
 
     @Test
+    public void testSetUp_bootCompleteImmediate_space() throws Exception {
+        EasyMock.expect(mMockDevice.executeShellCommand("setprop sys.boot_completed 0")).andReturn(
+                null).once();
+        EasyMock.expect(mMockDevice.executeShellCommand("pidof system_server")).andReturn(
+                "123").once();
+        EasyMock.expect(mMockDevice.executeShellCommand("kill 123")).andReturn(null).once();
+        EasyMock.expect(mMockDevice.executeShellCommand("getprop sys.boot_completed")).andReturn(
+                "1 ").once();
+        EasyMock.replay(mMockDevice, mMockBuildInfo);
+
+        mRestartSystemServerTargetPreparer.setUp(mMockDevice, mMockBuildInfo);
+        EasyMock.verify(mMockDevice, mMockBuildInfo);
+    }
+
+    @Test
     public void testSetUp_bootCompleteAfterOneTry() throws Exception {
         EasyMock.expect(mMockDevice.executeShellCommand("setprop sys.boot_completed 0")).andReturn(
                 null).once();