diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-11-23 16:34:23 (GMT) |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2016-11-23 16:34:23 (GMT) |
| commit | 37030cd0ee15151307dfe4b8416bf3dff9525c6b (patch) | |
| tree | 7cd18d27aee2bb81592649c3d00d6c588019c793 | |
| parent | 664772bed98cbc0d5e899b9eeb2eb52bac4806ff (diff) | |
Adjust expected cpu_model in NullRunner.test_tree_output_dir()
cpu_model does not always exist on armhf machines; if they get booted with
compat_uts_machine=armv7l then the machine name will be "armv7l", but don't
have the corresponding model in /proc.
| -rwxr-xr-x | tests/autopkgtest | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/autopkgtest b/tests/autopkgtest index dff5db2..0e2fbf4 100755 --- a/tests/autopkgtest +++ b/tests/autopkgtest @@ -453,7 +453,7 @@ class NullRunner(AdtTestCase, DebTestsAll, DebTestsFailureModes): self.assertEqual(info['virt_server'], 'autopkgtest-virt-null') self.assertEqual(info['nproc'], subprocess.check_output(['nproc'], universal_newlines=True).strip()) - if os.uname()[4] in ['x86_64', 'i686', 'armv7l']: + if os.uname()[4] in ['x86_64', 'i686']: self.assertIn('cpu_model', info) self.assertIn('cpu_flags', info) |