qubes/tests: fix qrexec policy context

Now it removes policy file if it was created while entering the context.

qubes/tests/__init__.py

@@ -243,31 +243,47 @@ class _QrexecPolicyContext(object):
         self._filename = pathlib.Path('/etc/qubes-rpc/policy') / service
         self._rule = '{} {} {}\n'.format(source, destination,
             'allow' if allow else 'deny')
+        self._did_create = False
+        self._handle = None
 
-    def _change(self, add=True):
+    def load(self):
-        try:
+        if self._handle is None:
-            policy = self._filename.open('r+')
+            try:
-        except FileNotFoundError:
+                self._handle = self._filename.open('r+')
-            policy = self._filename.open('w+')
+            except FileNotFoundError:
+                self._handle = self._filename.open('w+')
+                self._did_create = True
+        self._handle.seek(0)
+        return self._handle.readlines()
 
-        try:
+    def save(self, rules):
-            policy_rules = policy.readlines()
+        assert self._handle is not None
-            if add:
+        self._handle.truncate(0)
-                policy_rules.insert(0, self._rule)
+        self._handle.seek(0)
-            else:
+        self._handle.write(''.join(rules))
-                policy_rules.remove(self._rule)
+
-            policy.truncate(0)
+    def close(self):
-            policy.seek(0)
+        assert self._handle is not None
-            policy.write(''.join(policy_rules))
+        self._handle.close()
-        finally:
+        self._handle = None
-            policy.close()
 
     def __enter__(self):
-        self._change(add=True)
+        rules = self.load()
+        rules.insert(0, self._rule)
+        self.save(self._rule)
         return self
 
     def __exit__(self, exc_type, exc_value, tb):
-        self._change(add=False)
+        if not self._did_create:
+            try:
+                rules = self.load()
+                rules.remove(self._rule)
+                self.save(rules)
+            finally:
+                self.close()
+        else:
+            self.close()
+            os.unlink(self._filename)
 
 class substitute_entry_points(object):
     '''Monkey-patch pkg_resources to substitute one group in iter_entry_points