Partly revert "proper mockups for s3-related tests + retrying setup"

This partly reverts commit b89339b.

Signed-off-by: Tobias Wolf <[email protected]>

Author: NotTheEvilOne

src/gardenlinux/constants.py

@@ -161,8 +161,3 @@
 # https://github.com/gardenlinux/gardenlinux/issues/3044
 # Empty string is the 'legacy' variant with traditional root fs and still needed/supported
 IMAGE_VARIANTS = ["", "_usi", "_tpm2_trustedboot"]
-
-# configuration for https://github.com/groodt/retrying
-RETRYING_MAX_ATTEMPTS = 5
-RETRYING_WAIT_EXPONENTIAL_MULTIPLIER = 1000
-RETRYING_WAIT_EXPONENTIAL_MAX = 16000

src/gardenlinux/s3/bucket.py

@@ -14,7 +14,6 @@
 import boto3
 from retrying import retry
 
-from ..constants import RETRYING_MAX_ATTEMPTS, RETRYING_WAIT_EXPONENTIAL_MAX, RETRYING_WAIT_EXPONENTIAL_MULTIPLIER
 from ..logger import LoggerSetup
 
 
@@ -90,9 +89,7 @@ class tree for self).
 
         return getattr(self._bucket, name)
 
-    @retry(stop_max_attempt_number=RETRYING_MAX_ATTEMPTS,
-           wait_exponential_multiplier=RETRYING_WAIT_EXPONENTIAL_MULTIPLIER,
-           wait_exponential_max=RETRYING_WAIT_EXPONENTIAL_MAX)
+    @retry(stop_max_attempt_number=5, wait_exponential_multiplier=1000, wait_exponential_max=16000)
     def download_file(self, key, file_name, *args, **kwargs):
         """
         boto3: Download an S3 object to a file.