diff options
| author | Ang Li <angli@google.com> | 2019-09-27 20:30:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-27 20:30:16 -0700 |
| commit | 7fa0bf4498d315fdbec9a1e4264ac5b27a9e2c02 (patch) | |
| tree | 2ac9f88d750fbfdf34fe2ad6dfaa5ea8af89d60d /tests/mobly/controllers/android_device_test.py | |
| parent | e6888c85b498c39b640214c5c4fe534e720eb558 (diff) | |
| download | mobly-7fa0bf4498d315fdbec9a1e4264ac5b27a9e2c02.tar.gz | |
Utilize new output file APIs in `logcat_service`. (#634)
Diffstat (limited to 'tests/mobly/controllers/android_device_test.py')
| -rwxr-xr-x | tests/mobly/controllers/android_device_test.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/tests/mobly/controllers/android_device_test.py b/tests/mobly/controllers/android_device_test.py index 9620c99..91381ab 100755 --- a/tests/mobly/controllers/android_device_test.py +++ b/tests/mobly/controllers/android_device_test.py @@ -489,7 +489,8 @@ class AndroidDeviceTest(unittest.TestCase): ad = android_device.AndroidDevice(serial=mock_serial) get_log_file_timestamp_mock.return_value = '07-22-2019_17-53-34-450' filename = ad.generate_filename('MagicLog') - self.assertEqual(filename, 'MagicLog,1,07-22-2019_17-53-34-450') + self.assertEqual(filename, + 'MagicLog,1,fakemodel,07-22-2019_17-53-34-450') @mock.patch('mobly.controllers.android_device_lib.adb.AdbProxy', return_value=mock_android_device.MockAdbProxy('1')) @@ -505,7 +506,7 @@ class AndroidDeviceTest(unittest.TestCase): get_log_file_timestamp_mock.return_value = '07-22-2019_17-53-34-450' filename = ad.generate_filename('MagicLog') sanitize_filename_mock.assert_called_with( - 'MagicLog,1,07-22-2019_17-53-34-450') + 'MagicLog,1,fakemodel,07-22-2019_17-53-34-450') @mock.patch('mobly.controllers.android_device_lib.adb.AdbProxy', return_value=mock_android_device.MockAdbProxy('1')) @@ -518,7 +519,8 @@ class AndroidDeviceTest(unittest.TestCase): ad = android_device.AndroidDevice(serial=mock_serial) get_log_file_timestamp_mock.return_value = '07-22-2019_17-53-34-450' filename = ad.generate_filename('MagicLog', extension_name='log') - self.assertEqual(filename, 'MagicLog,1,07-22-2019_17-53-34-450.log') + self.assertEqual(filename, + 'MagicLog,1,fakemodel,07-22-2019_17-53-34-450.log') @mock.patch('mobly.controllers.android_device_lib.adb.AdbProxy', return_value=mock_android_device.MockAdbProxy('1')) @@ -532,7 +534,8 @@ class AndroidDeviceTest(unittest.TestCase): get_log_file_timestamp_mock.return_value = '07-22-2019_17-53-34-450' ad.debug_tag = 'RoleX' filename = ad.generate_filename('MagicLog') - self.assertEqual(filename, 'MagicLog,RoleX,1,07-22-2019_17-53-34-450') + self.assertEqual(filename, + 'MagicLog,RoleX,1,fakemodel,07-22-2019_17-53-34-450') @mock.patch('mobly.controllers.android_device_lib.adb.AdbProxy', return_value=mock_android_device.MockAdbProxy('1')) @@ -549,7 +552,7 @@ class AndroidDeviceTest(unittest.TestCase): 'test_xyz', '/tmp/blah/', mock_record) filename = ad.generate_filename('MagicLog', time_identifier=mock_test_info) - self.assertEqual(filename, 'MagicLog,1,test_xyz-1234567') + self.assertEqual(filename, 'MagicLog,1,fakemodel,test_xyz-1234567') @mock.patch('mobly.controllers.android_device_lib.adb.AdbProxy', return_value=mock_android_device.MockAdbProxy('1')) @@ -563,7 +566,7 @@ class AndroidDeviceTest(unittest.TestCase): get_log_file_timestamp_mock.return_value = '07-22-2019_17-53-34-450' filename = ad.generate_filename('MagicLog', time_identifier='my_special_time') - self.assertEqual(filename, 'MagicLog,1,my_special_time') + self.assertEqual(filename, 'MagicLog,1,fakemodel,my_special_time') @mock.patch('mobly.controllers.android_device_lib.adb.AdbProxy', return_value=mock_android_device.MockAdbProxy(1)) |