tests: remove/skip some tests

1. It is unclear yet whether dispvm_netvm will be implemented in core3, but
probably not.
2. Remove tests for setting memory/cpu above host resouces - rejecting
those values at property set time would break backup restore on some
machines (when migrating from bigger to smaller system).

qubes/tests/vm/mix/net.py

@@ -22,6 +22,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
+import unittest
 
 import qubes
 import qubes.vm.qubesvm
@@ -81,6 +82,7 @@ class TC_00_NetVMMixin(
         self.app.domains = {1: vm, vm: vm}
         self.assertPropertyInvalidValue(vm, 'netvm', vm)
 
+    @unittest.skip('TODO: probably remove')
     def test_290_dispvm_netvm(self):
         vm = self.get_vm()
         self.setup_netvms(vm)
@@ -96,18 +98,21 @@ class TC_00_NetVMMixin(
         # XXX FIXME xml value
         self.assertPropertyValue(vm, 'dispvm_netvm', None, None, 'None')
 
+    @unittest.skip('TODO: probably remove')
     def test_291_dispvm_netvm_invalid(self):
         vm = self.get_vm()
         self.setup_netvms(vm)
         self.assertPropertyInvalidValue(vm, 'dispvm_netvm', 'invalid')
         self.assertPropertyInvalidValue(vm, 'dispvm_netvm', 123)
 
+    @unittest.skip('TODO: probably remove')
     def test_291_dispvm_netvm_netvm(self):
         vm = self.get_vm()
         nonetvm = TestVM(qid=2, app=self.app, name='nonetvm')
         self.app.domains = {1: vm, 2: nonetvm}
         self.assertPropertyInvalidValue(vm, 'dispvm_netvm', nonetvm)
 
+    @unittest.skip('TODO: probably remove')
     def test_291_dispvm_netvm_default(self):
         """Check if vm.dispvm_netvm default is really vm.netvm"""
         vm = self.get_vm()
@@ -117,6 +122,7 @@ class TC_00_NetVMMixin(
         del vm.netvm
         self.assertPropertyDefaultValue(vm, 'dispvm_netvm', self.netvm1)
 
+    @unittest.skip('TODO: probably remove')
     def test_292_dispvm_netvm_loopback(self):
         vm = self.get_vm()
         self.app.domains = {1: vm, vm: vm}

qubes/tests/vm/qubesvm.py

@@ -288,11 +288,6 @@ class TC_90_QubesVM(QubesVMTestsMixin,qubes.tests.QubesTestCase):
         self.assertPropertyInvalidValue(vm, 'memory', -100)
         self.assertPropertyInvalidValue(vm, 'memory', '-100')
         self.assertPropertyInvalidValue(vm, 'memory', '')
-
-    def test_162_memory_more_than_host(self):
-        vm = self.get_vm()
-        self.assertPropertyInvalidValue(vm, 'memory',
-            2 * self.app.host.memory_total)
         # TODO: higher than maxmem
         # TODO: human readable setter (500M, 4G)?
 
@@ -311,11 +306,6 @@ class TC_90_QubesVM(QubesVMTestsMixin,qubes.tests.QubesTestCase):
         self.assertPropertyInvalidValue(vm, 'maxmem', -100)
         self.assertPropertyInvalidValue(vm, 'maxmem', '-100')
         self.assertPropertyInvalidValue(vm, 'maxmem', '')
-
-    def test_172_maxmem_more_than_host(self):
-        vm = self.get_vm()
-        self.assertPropertyInvalidValue(vm, 'maxmem',
-            2 * self.app.host.memory_total)
         # TODO: lower than memory
         # TODO: human readable setter (500M, 4G)?
 
@@ -337,8 +327,6 @@ class TC_90_QubesVM(QubesVMTestsMixin,qubes.tests.QubesTestCase):
         self.assertPropertyInvalidValue(vm, 'vcpus', -2)
         self.assertPropertyInvalidValue(vm, 'vcpus', '-2')
         self.assertPropertyInvalidValue(vm, 'vcpus', '')
-        self.assertPropertyInvalidValue(vm, 'vcpus',
-            2 * self.app.host.no_cpus)
 
     def test_200_debug(self):
         vm = self.get_vm()
@@ -352,10 +340,6 @@ class TC_90_QubesVM(QubesVMTestsMixin,qubes.tests.QubesTestCase):
         vm = self.get_vm()
         self._test_generic_bool_property(vm, 'include_in_backups', True)
 
-    def test_230_backup_content(self):
-        vm = self.get_vm()
-        self._test_generic_bool_property(vm, 'backup_content', False)
-
     def test_240_firewall_conf(self):
         vm = self.get_vm()
         self.assertPropertyDefaultValue(vm, 'firewall_conf', 'firewall.xml')