remove stale test data on the device

build/android/pylib/device/device_utils_test.py

Index: build/android/pylib/device/device_utils_test.py
diff --git a/build/android/pylib/device/device_utils_test.py b/build/android/pylib/device/device_utils_test.py
index ca097b79c9b067253090876b4627d8c40ac11d17..f6ac8168198f7d154366e084721f15184edfb4ed 100755
--- a/build/android/pylib/device/device_utils_test.py
+++ b/build/android/pylib/device/device_utils_test.py
@@ -529,9 +529,10 @@ class DeviceUtilsInstallTest(DeviceUtilsTest):
          'this.is.a.test.package'),
         (self.call.device.GetApplicationPath('this.is.a.test.package'),
          '/fake/data/app/this.is.a.test.package.apk'),
-        (self.call.device._GetChangedFilesImpl(
+        (self.call.device._GetChangedAndStaleFiles(
             '/fake/test/app.apk', '/fake/data/app/this.is.a.test.package.apk'),
-         [('/fake/test/app.apk', '/fake/data/app/this.is.a.test.package.apk')]),
+         ([('/fake/test/app.apk', '/fake/data/app/this.is.a.test.package.apk')],
+          [])),
         self.call.adb.Uninstall('this.is.a.test.package'),
         self.call.adb.Install('/fake/test/app.apk', reinstall=False)):
       self.device.Install('/fake/test/app.apk', retries=0)
@@ -542,9 +543,10 @@ class DeviceUtilsInstallTest(DeviceUtilsTest):
          'this.is.a.test.package'),
         (self.call.device.GetApplicationPath('this.is.a.test.package'),
          '/fake/data/app/this.is.a.test.package.apk'),
-        (self.call.device._GetChangedFilesImpl(
+        (self.call.device._GetChangedAndStaleFiles(
             '/fake/test/app.apk', '/fake/data/app/this.is.a.test.package.apk'),
-         [('/fake/test/app.apk', '/fake/data/app/this.is.a.test.package.apk')]),
+         ([('/fake/test/app.apk', '/fake/data/app/this.is.a.test.package.apk')],
+          [])),
         self.call.adb.Install('/fake/test/app.apk', reinstall=True)):
       self.device.Install('/fake/test/app.apk', reinstall=True, retries=0)
 
@@ -554,9 +556,9 @@ class DeviceUtilsInstallTest(DeviceUtilsTest):
          'this.is.a.test.package'),
         (self.call.device.GetApplicationPath('this.is.a.test.package'),
          '/fake/data/app/this.is.a.test.package.apk'),
-        (self.call.device._GetChangedFilesImpl(
+        (self.call.device._GetChangedAndStaleFiles(
             '/fake/test/app.apk', '/fake/data/app/this.is.a.test.package.apk'),
-         [])):
+         ([],[]))):

[perezju, 2015/06/11 08:38:47]

nit: space after the comma

[Menglin, 2015/06/11 20:36:16]

Done.

       self.device.Install('/fake/test/app.apk', retries=0)
 
   def testInstall_fails(self):
@@ -1174,7 +1176,6 @@ class DeviceUtilsPushChangedFilesZippedTest(DeviceUtilsTest):
         [('/test/host/path/file1', '/test/device/path/file1'),
          ('/test/host/path/file2', '/test/device/path/file2')])
 

[perezju, 2015/06/11 08:38:48]

nit: two blank lines between classes

[Menglin, 2015/06/11 20:36:17]

Done.

-
 class DeviceUtilsFileExistsTest(DeviceUtilsTest):
 
   def testFileExists_usingTest_fileExists(self):