api/admin: skip firewall in vm.Clone

This operation is going to be removed, so apply a quick fix for tests. QubesOS/qubes-issues#2622
QubesOS · Jun 26, 2017 · 65d15e6 · 65d15e6
1 parent 2601312
commit 65d15e6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/qubes/api/admin.py b/qubes/api/admin.py
@@ -853,7 +853,7 @@ def vm_clone(self, untrusted_payload):
             dst_vm.clone_properties(src_vm)
             dst_vm.tags.update(src_vm.tags)
             dst_vm.features.update(src_vm.features)
-            dst_vm.firewall.clone(src_vm.firewall)
+            #dst_vm.firewall.clone(src_vm.firewall)
             for devclass in src_vm.devices:
                 for device_assignment in src_vm.devices[devclass].assignments():
                     dst_vm.devices[devclass].attach(device_assignment.clone())

diff --git a/qubes/tests/api_admin.py b/qubes/tests/api_admin.py
@@ -1250,7 +1250,7 @@ def test_350_vm_clone(self, mock_verify, mock_clone):
         self.assertEqual(vm.template, self.app.domains['test-template'])
         self.assertEqual(vm.tags, self.vm.tags)
         self.assertEqual(vm.features, self.vm.features)
-        self.assertEqual(vm.firewall, self.vm.firewall)
+        #self.assertEqual(vm.firewall, self.vm.firewall)
         self.assertEqual(mock_clone.mock_calls,
             [unittest.mock.call(self.app.domains['test-vm2']).clone(
                 self.app.domains['test-vm1'])])