diff options
| author | Ryan Harper <[email protected]> | 2017-11-27 11:12:19 -0600 |
|---|---|---|
| committer | Ryan Harper <[email protected]> | 2017-11-27 11:12:19 -0600 |
| commit | 6a6015221fe110d89400bf8240180e4b666c6dc2 (patch) | |
| tree | 12f9f9fad253b2688f6b5690bb0a53b748fdce50 /tests/vmtests/test_basic.py | |
| parent | a57f85bcfa1858aa91de8eb65a46b942ff6fbc4a (diff) | |
| parent | 1f02354711dd7bd587d1b3d47dc697ac2b516776 (diff) | |
merge from trunk
bzr-revno: 519.3.9
Diffstat (limited to 'tests/vmtests/test_basic.py')
| -rw-r--r-- | tests/vmtests/test_basic.py | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py index f8af5c5d..978a4991 100644 --- a/tests/vmtests/test_basic.py +++ b/tests/vmtests/test_basic.py @@ -138,49 +138,6 @@ class TestBasicAbs(VMBaseClass): self.assertEqual(source_version, installed_version) -class PreciseTestBasic(relbase.precise, TestBasicAbs): - __test__ = True - - collect_scripts = [textwrap.dedent(""" - cd OUTPUT_COLLECT_D - blkid -o export /dev/vda > blkid_output_vda - blkid -o export /dev/vda1 > blkid_output_vda1 - blkid -o export /dev/vda2 > blkid_output_vda2 - f="btrfs_uuid_vdd" - btrfs-show /dev/vdd | awk '/uuid/ {print $4}' > $f - cat /proc/partitions > proc_partitions - ls -al /dev/disk/by-uuid/ > ls_uuid - cat /etc/fstab > fstab - mkdir -p /dev/disk/by-dname - ls /dev/disk/by-dname/ > ls_dname - find /etc/network/interfaces.d > find_interfacesd - - v="" - out=$(apt-config shell v Acquire::HTTP::Proxy) - eval "$out" - echo "$v" > apt-proxy - """)] - - def test_whole_disk_format(self): - # confirm the whole disk format is the expected device - btrfs_uuid = self.load_collect_file("btrfs_uuid_vdd").strip() - - self.assertTrue(btrfs_uuid is not None) - self.assertEqual(len(btrfs_uuid), 36) - - # extract uuid from ls_uuid by kname - kname_uuid = self._kname_to_uuid('vdd') - - # compare them - self.assertEqual(kname_uuid, btrfs_uuid) - - def test_ptable(self): - print("test_ptable does not work for Precise") - - def test_dname(self): - print("test_dname does not work for Precise") - - class TrustyTestBasic(relbase.trusty, TestBasicAbs): __test__ = True @@ -194,11 +151,6 @@ class TrustyTestBasic(relbase.trusty, TestBasicAbs): print("test_ptable does not work for Trusty") -class PreciseHWETTestBasic(relbase.precise_hwe_t, PreciseTestBasic): - # FIXME: off due to test_whole_disk_format failing - __test__ = False - - class TrustyHWEXTestBasic(relbase.trusty_hwe_x, TrustyTestBasic): __test__ = True |