Merge "Fix test following -p removal." am: 5e49fbc547
am: 3039d9d4fa
Change-Id: I3924df5cb5a3a9631a2179d46939e0ff2f9e3e52
diff --git a/adb/test_device.py b/adb/test_device.py
index e44cc83..9ef4676 100644
--- a/adb/test_device.py
+++ b/adb/test_device.py
@@ -1144,10 +1144,16 @@
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: