Merge pull request #1090 from freedomofpress/enable-tests

Enable and fix tests that weren't running

tests/test_vms_exist.py

@@ -190,26 +190,7 @@ def test_sd_log_config(self):
  vol = vm.volumes["private"]
  self.assertEqual(vol.size, size * 1024 * 1024 * 1024)
 
- def sd_app_template(self):
- vm = self.app.domains[SD_TEMPLATE_SMALL]
- nvm = vm.netvm
- self.assertIsNone(nvm)
- self.assertIn("sd-workstation", vm.tags)
-
- def sd_viewer_template(self):
- vm = self.app.domains[SD_TEMPLATE_LARGE]
- nvm = vm.netvm
- self.assertIsNone(nvm)
- self.assertIn("sd-workstation", vm.tags)
- self.assertTrue(vm.template_for_dispvms)
-
- def sd_export_template(self):
- vm = self.app.domains[SD_TEMPLATE_LARGE]
- nvm = vm.netvm
- self.assertIsNone(nvm)
- self.assertIn("sd-workstation", vm.tags)
-
- def sd_export_dvm(self):
+ def test_sd_export_dvm(self):
  vm = self.app.domains["sd-devices-dvm"]
  nvm = vm.netvm
  self.assertIsNone(nvm)
@@ -218,9 +199,9 @@ def sd_export_dvm(self):
 
  # MIME handling (dvm does NOT setup mime, only its disposables do)
  self.assertNotIn("service.securedrop-mime-handling", vm.features)
- self._check_service_running(vm, "securedrop-mime-handling")
+ self._check_service_running(vm, "securedrop-mime-handling", running=False)
 
- def sd_export(self):
+ def test_sd_export(self):
  vm = self.app.domains["sd-devices"]
  nvm = vm.netvm
  self.assertIsNone(nvm)
@@ -233,19 +214,19 @@ def sd_export(self):
  self.assertEqual(vm.features["vm-config.SD_MIME_HANDLING"], "sd-devices")
  self._check_service_running(vm, "securedrop-mime-handling")
 
- def sd_small_template(self):
+ def test_sd_small_template(self):
+ # Kernel check is handled in test_grsec_kernel
  vm = self.app.domains[SD_TEMPLATE_SMALL]
  nvm = vm.netvm
  self.assertIsNone(nvm)
  self.assertIn("sd-workstation", vm.tags)
- self.assertFalse(vm.template_for_dispvms)
 
- def sd_large_template(self):
+ def test_sd_large_template(self):
+ # Kernel check is handled in test_grsec_kernel
  vm = self.app.domains[SD_TEMPLATE_LARGE]
  nvm = vm.netvm
  self.assertIsNone(nvm)
  self.assertIn("sd-workstation", vm.tags)
- self.assertFalse(vm.template_for_dispvms)
 
 
 def load_tests(loader, tests, pattern):