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

am 3b5b1328: Merge "adb/test_device.py fixes for win32 and no use of ANDROID_SERIAL" 

* commit '3b5b1328173b4914ccc3c50bdd5eaa046dbd6cd7':
  adb/test_device.py fixes for win32 and no use of ANDROID_SERIAL
This commit is contained in:
Dan Albert 2015-07-30 17:09:04 +00:00 committed by Android Git Automerger
parent fb1ecbc55e 3b5b132817
commit cc552ea335
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
adb/test_device.py
View File

@ -55,10 +55,15 @@ def requires_root(func):
class GetDeviceTest(unittest.TestCase):
def setUp(self):
self.android_serial = os.getenv('ANDROID_SERIAL')
del os.environ['ANDROID_SERIAL']
if 'ANDROID_SERIAL' in os.environ:
del os.environ['ANDROID_SERIAL']
def tearDown(self):
os.environ['ANDROID_SERIAL'] = self.android_serial
if self.android_serial is not None:
os.environ['ANDROID_SERIAL'] = self.android_serial
else:
if 'ANDROID_SERIAL' in os.environ:
del os.environ['ANDROID_SERIAL']
@mock.patch('adb.device.get_devices')
def test_explicit(self, mock_get_devices):
@ -311,7 +316,7 @@ def make_random_device_files(device, in_dir, num_files):
size = random.randrange(min_size, max_size, 1024)
base_name = 'device_tmpfile' + str(file_num)
full_path = os.path.join(in_dir, base_name)
full_path = posixpath.join(in_dir, base_name)
device.shell(['dd', 'if=/dev/urandom', 'of={}'.format(full_path),
'bs={}'.format(size), 'count=1'])