diff options
author | Pirama Arumuga Nainar <pirama@google.com> | 2021-03-10 05:57:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-10 05:57:21 +0000 |
commit | 898f8d62d1305674635d1e341b5839154d4e6acd (patch) | |
tree | 73936aba47fe1dc71e9cc05af9747036e935608c /crosperf/machine_manager_unittest.py | |
parent | 5948a3ee3be44c312f11fb2acc617cce94e95582 (diff) | |
parent | 6e9f5ed75e19d8fc561fda91f5d133ef1ceacd03 (diff) | |
download | toolchain-utils-android12-qpr3-s4-release.tar.gz |
Merging 15 commit(s) from Chromium's toolchain-utils am: f5cc9231be am: 1b67a6a703 am: 6e9f5ed75eandroid-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-release
Original change: https://android-review.googlesource.com/c/platform/external/toolchain-utils/+/1624621
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3e09c0f25dea2ce281aa3edc999669d4d383510b
Diffstat (limited to 'crosperf/machine_manager_unittest.py')
-rwxr-xr-x | crosperf/machine_manager_unittest.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/crosperf/machine_manager_unittest.py b/crosperf/machine_manager_unittest.py index 26eacbd7..f47cc881 100755 --- a/crosperf/machine_manager_unittest.py +++ b/crosperf/machine_manager_unittest.py @@ -44,8 +44,8 @@ class MyMachineManager(machine_manager.MachineManager): assert m.name != machine_name, 'Tried to double-add %s' % machine_name cm = machine_manager.MockCrosMachine(machine_name, self.chromeos_root, 'average') - assert cm.machine_checksum, ( - 'Could not find checksum for machine %s' % machine_name) + assert cm.machine_checksum, ('Could not find checksum for machine %s' % + machine_name) self._all_machines.append(cm) @@ -87,9 +87,10 @@ class MachineManagerTest(unittest.TestCase): def setUp(self, mock_isdir): mock_isdir.return_value = True - self.mm = machine_manager.MachineManager( - '/usr/local/chromeos', 0, 'average', None, self.mock_cmd_exec, - self.mock_logger) + self.mm = machine_manager.MachineManager('/usr/local/chromeos', 0, + 'average', None, + self.mock_cmd_exec, + self.mock_logger) self.mock_lumpy1.name = 'lumpy1' self.mock_lumpy2.name = 'lumpy2' @@ -225,15 +226,14 @@ class MachineManagerTest(unittest.TestCase): self.assertEqual(mock_sleep.call_count, 0) def test_compute_common_checksum(self): - self.mm.machine_checksum = {} self.mm.ComputeCommonCheckSum(LABEL_LUMPY) self.assertEqual(self.mm.machine_checksum['lumpy'], 'lumpy123') self.assertEqual(len(self.mm.machine_checksum), 1) self.mm.machine_checksum = {} - self.assertRaises(machine_manager.BadChecksum, - self.mm.ComputeCommonCheckSum, LABEL_MIX) + self.assertRaisesRegex(machine_manager.BadChecksum, r'daisy.*\n.*lumpy', + self.mm.ComputeCommonCheckSum, LABEL_MIX) def test_compute_common_checksum_string(self): self.mm.machine_checksum_string = {} @@ -583,8 +583,8 @@ power management: CHECKSUM_STRING = ('processor: 0vendor_id: GenuineIntelcpu family: 6model: ' '42model name: Intel(R) Celeron(R) CPU 867 @ ' '1.30GHzstepping: 7microcode: 0x25cache size: 2048 ' - 'KBphysical id: 0siblings: 2core id: 0cpu cores: 2apicid: ' - '0initial apicid: 0fpu: yesfpu_exception: yescpuid level: ' + 'KBphysical id: 0siblings: 2cpu cores: 2' + 'fpu: yesfpu_exception: yescpuid level: ' '13wp: yesflags: fpu vme de pse tsc msr pae mce cx8 apic sep' ' mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse ' 'sse2 ss ht tm pbe syscall nx rdtscp lm constant_tsc ' @@ -597,8 +597,8 @@ CHECKSUM_STRING = ('processor: 0vendor_id: GenuineIntelcpu family: 6model: ' 'bits virtualpower management:processor: 1vendor_id: ' 'GenuineIntelcpu family: 6model: 42model name: Intel(R) ' 'Celeron(R) CPU 867 @ 1.30GHzstepping: 7microcode: 0x25cache' - ' size: 2048 KBphysical id: 0siblings: 2core id: 1cpu cores:' - ' 2apicid: 2initial apicid: 2fpu: yesfpu_exception: yescpuid' + ' size: 2048 KBphysical id: 0siblings: 2cpu cores:' + ' 2fpu: yesfpu_exception: yescpuid' ' level: 13wp: yesflags: fpu vme de pse tsc msr pae mce cx8 ' 'apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx ' 'fxsr sse sse2 ss ht tm pbe syscall nx rdtscp lm ' |