Promium 3.3.25__tar.gz → 3.3.26__tar.gz

{Promium-3.3.25 → Promium-3.3.26}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: Promium
-Version: 3.3.25
+Version: 3.3.26
 Summary: Selenium wrapper for testing Web UI
 Author: Denis Korytkin, Nataliia Guieva, Roman Zaporozhets, Vladimir Kritov, Oleh Dykusha
 Project-URL: Home page, https://none
 Project-URL: Documentation, https://none
 Keywords: Testing UI,Selenium,PageObject,Selenium wrapper
 Platform: linux
-Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Testing

{Promium-3.3.25 → Promium-3.3.26}/Promium.egg-info/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: Promium
-Version: 3.3.25
+Version: 3.3.26
 Summary: Selenium wrapper for testing Web UI
 Author: Denis Korytkin, Nataliia Guieva, Roman Zaporozhets, Vladimir Kritov, Oleh Dykusha
 Project-URL: Home page, https://none
 Project-URL: Documentation, https://none
 Keywords: Testing UI,Selenium,PageObject,Selenium wrapper
 Platform: linux
-Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Testing

{Promium-3.3.25 → Promium-3.3.26}/promium/base.py

@@ -315,7 +315,7 @@ class Collection(Base, Sequence):
     def is_not_empty(self):
         return not self.is_empty()
 
-    def random_choice(self):
+    def random_choice(self) -> WebElement:
         elements = self.wait_not_empty()
         index = random.randint(0, len(elements) - 1)
         return self.get_item(index)

{Promium-3.3.25 → Promium-3.3.26}/promium/elements/link.py

@@ -1,13 +1,14 @@
 
 import requests
-
-from requests.adapters import HTTPAdapter
-from requests.packages.urllib3.util.retry import Retry
+import logging
 
 from promium.base import Element
 from promium.helpers import ParseUrl
 
 
+log = logging.getLogger(__name__)
+
+
 class Link(Element):
 
     @property
@@ -32,19 +33,17 @@ class Link(Element):
 
     @property
     def response(self):
-        retry_strategy = Retry(
-            total=3,
-            backoff_factor=0.2,
-            status_forcelist=[502, 503, 504],
-            method_whitelist=["GET"]
-        )
-        adapter = HTTPAdapter(max_retries=retry_strategy)
         session = requests.Session()
         for cookie in self.driver.get_cookies():
             session.cookies.set(cookie['name'], cookie['value'])
-        session.mount("https://", adapter)
-        session.mount("http://", adapter)
-        return session.get(self.href, verify=False, timeout=10)
+        for i in range(1, 3):
+            r = session.get(self.href, verify=False, timeout=10)
+            if r.status_code in [502, 503, 504] and r.request.method == 'GET':
+                log.warning(f'[Request Retry]: attempt:{i}, status: {r.status}')
+            else:
+                break
+
+        return r
 
     @property
     def get_status_code(self):

{Promium-3.3.25 → Promium-3.3.26}/promium/plugin.py

@@ -7,9 +7,6 @@ from collections import namedtuple
 import pytest
 import allure
 
-from requests.adapters import HTTPAdapter
-from requests.packages.urllib3.util.retry import Retry
-
 from selenium.common.exceptions import WebDriverException
 from promium.test_case import create_driver
 from promium.common import upload_screenshot
@@ -147,14 +144,6 @@ def request_init(request):
         )
 
     session = requests.session()
-    retry_strategy = Retry(
-        total=3,
-        status_forcelist=[502, 503, 504],
-        method_whitelist=["POST", "GET"]
-    )
-    adapter = HTTPAdapter(max_retries=retry_strategy)
-    session.mount("https://", adapter)
-    session.mount("http://", adapter)
     session.url = (
         'Use self.get_response(url) for request tests or '
         'util methods for api tests!'

{Promium-3.3.25 → Promium-3.3.26}/promium/test_case.py

@@ -210,14 +210,27 @@ class RequestTestCase(TestCase, RequestSoftAssertion):
         request_cookies = {'xrequestid': self.xrequestid}
         if cookies:
             request_cookies.update(cookies)
-        response = self.session.request(
-            method=method,
-            url=url,
-            timeout=timeout,
-            verify=False,
-            cookies=request_cookies,
-            hooks=dict(response=request_logging),
-            **kwargs,
-        )
-        self.session.status_code = response.status_code
+
+        for i in range(1, 3):
+            response = self.session.request(
+                method=method,
+                url=url,
+                timeout=timeout,
+                verify=False,
+                cookies=request_cookies,
+                hooks=dict(response=request_logging),
+                **kwargs,
+            )
+            self.session.status_code = response.status_code
+            if (
+                    response.status_code in [502, 503, 504] and
+                    response.request.method in ["POST", "GET"]
+            ):
+                log.warning(
+                    f'[Request Retry]: attempt:{i}, '
+                    f'status: {response.status_code}'
+                )
+            else:
+                break
+
         return response

{Promium-3.3.25 → Promium-3.3.26}/setup.py

@@ -19,7 +19,7 @@ REQUIREMENTS = [
 
 setup(
     name='Promium',
-    version='3.3.25',
+    version='3.3.26',
     install_requires=REQUIREMENTS,
     author='Denis Korytkin, Nataliia Guieva, '
            'Roman Zaporozhets, Vladimir Kritov, '
@@ -36,7 +36,7 @@ setup(
     entry_points={'pytest11': ['promium = promium.plugin']},
     python_requires='>=3.10, <4',
     classifiers=[
-        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: Software Development :: Libraries :: Application Frameworks',
         'Topic :: Software Development :: Testing',

{Promium-3.3.25 → Promium-3.3.26}/tests/test_catalog_404.py

@@ -20,10 +20,9 @@ class Test404CatalogPage(WebDriverTestCase):
             'Оо! Страница не найдена',
             'Не правильно указан основной title на странице 404.'
         )
-        self.soft_assert_equals(
+        self.soft_assert_in(
+            'Похоже такой страницы больше нет',
             catalog_404_page.suggest_404_title.text,
-            'Похоже такой страницы больше нет, либо произошла какая-то ошибка, '
-            'попробуйте обновить страницу либо поискать что-то еще',
             'Не правильно указан suggest title на странице 404.'
         )