ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: b34b448bcd

Change-Id: I79a75b5167f7b8e03a176ed05f42c89000e43a61
This commit is contained in:
Dan Albert 2017-05-19 17:32:28 +00:00 • committed by android-build-merger
commit 05e2c509dd
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
adb/test_device.py
View file

@ -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: