From 06131cb72ac91ea3470fbde71f76be8e1994f0eb Mon Sep 17 00:00:00 2001
From: Raz Amir <ramir@drivenets.com>
Date: Wed, 8 Jan 2025 15:01:36 +0200
Subject: [PATCH] Fix rerun when reusing exisitng launch_uuid

---
 reportportal_client/client.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/reportportal_client/client.py b/reportportal_client/client.py
index f2fae55..063d3b8 100644
--- a/reportportal_client/client.py
+++ b/reportportal_client/client.py
@@ -401,6 +401,7 @@ class RPClient(RP):
     _skip_analytics: str
     _item_stack: LifoQueue
     _log_batcher: LogBatcher[RPRequestLog]
+    is_rerun: bool
 
     @property
     def launch_uuid(self) -> Optional[str]:
@@ -523,6 +524,7 @@ def __init__(
         self.launch_uuid_print = launch_uuid_print
         self.print_output = print_output
         self.truncate_attributes = truncate_attributes
+        self.is_rerun = False  # will be updated in start_launch
 
         self.api_key = api_key
         if not self.api_key:
@@ -567,7 +569,8 @@ def start_launch(
                             'rerun' option.
         :return:            Launch UUID if successfully started or None.
         """
-        if not self.use_own_launch:
+        self.is_rerun = rerun
+        if not self.use_own_launch and not self.is_rerun:
             return self.launch_uuid
         url = uri_join(self.base_url_v2, "launch")
         request_payload = LaunchStartRequest(
@@ -576,6 +579,7 @@ def start_launch(
             attributes=verify_value_length(attributes) if self.truncate_attributes else attributes,
             description=description,
             mode=self.mode,
+            uuid=self.launch_uuid,
             rerun=rerun,
             rerun_of=rerun_of,
         ).payload
@@ -745,7 +749,7 @@ def finish_launch(
                             PASSED, FAILED, STOPPED, SKIPPED, CANCELLED
         :param attributes:  Launch attributes
         """
-        if self.use_own_launch:
+        if self.use_own_launch or self.is_rerun:
             if self.launch_uuid is NOT_FOUND or not self.launch_uuid:
                 logger.warning("Attempt to finish non-existent launch")
                 return