openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix test following -p removal. 

Just use the environment variable.

Test: nose2
Bug: None
Change-Id: I020c737f8aa7416b46794ce387a12f7959a9ca2a
This commit is contained in:
Dan Albert 2017-05-18 13:52:45 -07:00
parent 3d33dae74d
commit def4aae26d
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: