Merge "Fix test following -p removal." am: 5e49fbc547 am: 3039d9d4fa

am: 222a69bc92

Change-Id: I9c64b7b9fba10e73f71a17337231973c7bb031b1

1 files changed, 7 insertions, 1 deletions

diff --git a/adb/test_device.py b/adb/test_device.py
index e44cc83f0..9ef467680 100644
--- a/adb/test_device.py
+++ b/adb/test_device.py
@@ -1144,10 +1144,16 @@ class FileOperationsTest(DeviceTest):
             temp_files = make_random_host_files(in_dir=full_dir_path, num_files=32)
 
             # Clean up any trash on the device.
-            device = adb.get_device(product=base_dir)
+            device = adb.get_device()  # pylint: disable=no-member
             device.shell(['rm', '-rf', self.DEVICE_TEMP_DIR])
 
+            old_product_out = os.environ.get('ANDROID_PRODUCT_OUT')
+            os.environ['ANDROID_PRODUCT_OUT'] = base_dir
             device.sync('data')
+            if old_product_out is None:
+                del os.environ['ANDROID_PRODUCT_OUT']
+            else:
+                os.environ['ANDROID_PRODUCT_OUT'] = old_product_out
 
             # Confirm that every file on the device mirrors that on the host.
             for temp_file in temp_files: