From fc4571bdd1ee731b93ee48b134224cf5bc9920b9 Mon Sep 17 00:00:00 2001 From: synkd <48261305+synkd@users.noreply.github.com> Date: Thu, 14 Sep 2023 03:15:57 -0400 Subject: [PATCH] Fix regression from cloned manifest failover (#12605) This PR adds a check to resolve a regression in `upload_manifest` introduced by https://github.com/SatelliteQE/robottelo/pull/12515. (cherry picked from commit 8d516afed81f4a6bfc0dddf6f126edcfaf708c6e) --- robottelo/host_helpers/satellite_mixins.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/robottelo/host_helpers/satellite_mixins.py b/robottelo/host_helpers/satellite_mixins.py index b934e7d2495..bbf2c882c06 100644 --- a/robottelo/host_helpers/satellite_mixins.py +++ b/robottelo/host_helpers/satellite_mixins.py @@ -140,8 +140,9 @@ def upload_manifest(self, org_id, manifest=None, interface='API', timeout=None): :returns: the manifest upload result """ - if manifest.content is None: - manifest = clone() + if not isinstance(manifest, (bytes, io.BytesIO)): + if manifest.content is None: + manifest = clone() if timeout is None: # Set the timeout to 1500 seconds to align with the API timeout. timeout = 1500000