squash: post-rebase fixes

tmt/checks/watchdog.py

@@ -28,10 +28,7 @@
 def render_report_path(invocation: 'TestInvocation') -> Path:
     """ Render path to a watchdog report file from necessary components """
 
-    return invocation.data_path(
-        filename=REPORT_FILENAME,
-        create=True,
-        full=True)
+    return invocation.path / REPORT_FILENAME
 
 
 def report_progress(

tmt/steps/execute/__init__.py

@@ -264,22 +264,21 @@ def handle_reboot(self) -> bool:
             pass
 
         elif self.soft_reboot_requested:
-            if self.reboot_request_path.exists():
-                # Extract custom hints from the file, and reset it.
-                with open(self.reboot_request_path) as reboot_file:
-                    reboot_data = json.loads(reboot_file.read())
-
-                if reboot_data.get('command'):
-                    with suppress(TypeError):
-                        reboot_command = ShellScript(reboot_data.get('command'))
-
-                try:
-                    timeout = int(reboot_data.get('timeout'))
-                except ValueError:
-                    timeout = None
-
-                os.remove(self.reboot_request_path)
-                self.guest.push(self.test_data_path)
+            # Extract custom hints from the file, and reset it.
+            with open(self.reboot_request_path) as reboot_file:
+                reboot_data = json.loads(reboot_file.read())
+
+            if reboot_data.get('command'):
+                with suppress(TypeError):
+                    reboot_command = ShellScript(reboot_data.get('command'))
+
+            try:
+                timeout = int(reboot_data.get('timeout'))
+            except ValueError:
+                timeout = None
+
+            os.remove(self.reboot_request_path)
+            self.guest.push(self.test_data_path)
 
         rebooted = False