Merge pull request #1787 from seleniumbase/a-few-bug-fixes

Six Bug Fixes

Author: mdmintz

mkdocs_build/requirements.txt

@@ -15,7 +15,7 @@ ghp-import==2.1.0
 readme-renderer==37.3
 pymdown-extensions==9.9.2
 importlib-metadata==6.0.0
-pipdeptree==2.5.1
+pipdeptree==2.5.2
 bleach==6.0.0
 lunr==0.6.2
 nltk==3.8.1

requirements.txt

@@ -96,7 +96,7 @@ commonmark==0.9.1;python_version<"3.7"
 markdown-it-py==2.2.0;python_version>="3.7"
 mdurl==0.1.2;python_version>="3.7"
 rich==12.6.0;python_version<"3.7"
-rich==13.3.1;python_version>="3.7"
+rich==13.3.2;python_version>="3.7"
 
 # --- Testing Requirements --- #
 # ("pip install -r requirements.txt" also installs this, but "pip install -e ." won't.)

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.13.6"
+__version__ = "4.13.7"

seleniumbase/console_scripts/sb_caseplans.py

@@ -71,7 +71,9 @@ def show_no_case_plans_warning():
 
 def get_test_id(display_id):
     """The id used in various places such as the test log path."""
-    return display_id.replace(".py::", ".").replace("::", ".")
+    return (
+        display_id.replace(".py::", ".").replace("::", ".").replace(" ", "_")
+    )
 
 
 def generate_case_plan_boilerplates(

seleniumbase/console_scripts/sb_commander.py

@@ -93,7 +93,12 @@ def do_pytest_run(
         for test_number, test in enumerate(tests):
             if selected_tests[test_number].get():
                 full_run_command += " "
-                full_run_command += test
+                if ' ' not in test:
+                    full_run_command += test
+                elif '"' not in test:
+                    full_run_command += '"%s"' % test
+                else:
+                    full_run_command += test.replace(" ", "\\ ")
 
     if "(--edge)" in browser_string:
         full_run_command += " --edge"

seleniumbase/console_scripts/sb_print.py

@@ -91,6 +91,10 @@ def main():
         code_lang = "java"
     elif file_to_print.lower().endswith(".feature"):
         code_lang = "gherkin"
+    elif file_to_print.lower().endswith(".txt"):
+        code_lang = "javascript"
+    elif file_to_print.lower().endswith(".yml"):
+        code_lang = "javascript"
     elif file_to_print.lower().endswith(".in"):
         code_lang = "javascript"
     elif "." not in file_to_print:

seleniumbase/core/log_helper.py

@@ -190,8 +190,9 @@ def log_test_failure_data(test, test_logpath, driver, browser, url=None):
         except Exception:
             exc_message = "(Unknown Exception)"
             traceback_message = "(Unknown Traceback)"
-        data_to_save.append("Traceback: " + traceback_message)
-        data_to_save.append("Exception: " + str(exc_message))
+        traceback_message = str(traceback_message).strip()
+        data_to_save.append("Traceback:\n  %s" % traceback_message)
+        data_to_save.append("Exception: %s" % exc_message)
     else:
         traceback_message = None
         if hasattr(test, "is_behave") and test.is_behave:
@@ -232,16 +233,16 @@ def log_test_failure_data(test, test_logpath, driver, browser, url=None):
                 if "/site-packages/pluggy/" not in stack:
                     if "/site-packages/_pytest/" not in stack:
                         good_stack.append(stack)
-            traceback_message = "".join(good_stack)
-            data_to_save.append("Traceback: " + traceback_message)
+            traceback_message = str("".join(good_stack)).strip()
+            data_to_save.append("Traceback:\n  %s" % traceback_message)
             if hasattr(sys, "last_value"):
                 last_value = sys.last_value
                 if last_value:
-                    data_to_save.append("Exception: %s" + str(last_value))
+                    data_to_save.append("Exception: %s" % last_value)
             elif hasattr(sb_config, "_excinfo_value"):
                 data_to_save.append("Exception: %s" % sb_config._excinfo_value)
         else:
-            data_to_save.append("Traceback: " + traceback_message)
+            data_to_save.append("Traceback:\n  %s" % traceback_message)
     if hasattr(test, "is_nosetest") and test.is_nosetest:
         # Also save the data for the report
         sb_config._report_test_id = test_id
@@ -395,7 +396,11 @@ def get_test_id(test):
 
 def get_test_name(test):
     if "PYTEST_CURRENT_TEST" in os.environ:
-        test_name = os.environ["PYTEST_CURRENT_TEST"].split(" ")[0]
+        full_name = os.environ["PYTEST_CURRENT_TEST"]
+        if "] " in full_name:
+            test_name = full_name.split("] ")[0] + "]"
+        else:
+            test_name = full_name.split(" ")[0]
     elif test.is_pytest:
         test_name = "%s.py::%s::%s" % (
             test.__class__.__module__.split(".")[-1],
@@ -410,16 +415,6 @@ def get_test_name(test):
         )
     if test._sb_test_identifier and len(str(test._sb_test_identifier)) > 6:
         test_name = test._sb_test_identifier
-        if hasattr(test, "_using_sb_fixture_class"):
-            if test_name.count(".") >= 2:
-                parts = test_name.split(".")
-                full = parts[-3] + ".py::" + parts[-2] + "::" + parts[-1]
-                test_name = full
-        elif hasattr(test, "_using_sb_fixture_no_class"):
-            if test_name.count(".") >= 1:
-                parts = test_name.split(".")
-                full = parts[-2] + ".py::" + parts[-1]
-                test_name = full
     return test_name
 
 

seleniumbase/fixtures/base_case.py

@@ -251,6 +251,7 @@ def open(self, url):
                 or "ERR_CONNECTION_CLOSED" in e.msg
                 or "ERR_CONNECTION_RESET" in e.msg
                 or "ERR_NAME_NOT_RESOLVED" in e.msg
+                or "ERR_INTERNET_DISCONNECTED" in e.msg
             ):
                 shared_utils.check_if_time_limit_exceeded()
                 self.__check_browser()
@@ -14048,17 +14049,21 @@ def __get_test_id(self):
         if self._sb_test_identifier and len(str(self._sb_test_identifier)) > 6:
             test_id = self._sb_test_identifier
             test_id = test_id.replace(".py::", ".").replace("::", ".")
-            test_id = test_id.replace("/", ".")
+            test_id = test_id.replace("/", ".").replace(" ", "_")
         elif hasattr(self, "_using_sb_fixture") and self._using_sb_fixture:
             test_id = sb_config._latest_display_id
             test_id = test_id.replace(".py::", ".").replace("::", ".")
-            test_id = test_id.replace("/", ".")
+            test_id = test_id.replace("/", ".").replace(" ", "_")
         return test_id
 
     def __get_test_id_2(self):
         """The id for SeleniumBase Dashboard entries."""
         if "PYTEST_CURRENT_TEST" in os.environ:
-            return os.environ["PYTEST_CURRENT_TEST"].split(" ")[0]
+            full_name = os.environ["PYTEST_CURRENT_TEST"]
+            if "] " in full_name:
+                return full_name.split("] ")[0] + "]"
+            else:
+                return full_name.split(" ")[0]
         if hasattr(self, "is_behave") and self.is_behave:
             return self.__get_test_id()
         test_id = "%s.%s.%s" % (
@@ -14075,7 +14080,11 @@ def __get_test_id_2(self):
     def __get_display_id(self):
         """The id for running a test from pytest. (Displayed on Dashboard)"""
         if "PYTEST_CURRENT_TEST" in os.environ:
-            return os.environ["PYTEST_CURRENT_TEST"].split(" ")[0]
+            full_name = os.environ["PYTEST_CURRENT_TEST"]
+            if "] " in full_name:
+                return full_name.split("] ")[0] + "]"
+            else:
+                return full_name.split(" ")[0]
         if hasattr(self, "is_behave") and self.is_behave:
             file_name = sb_config.behave_scenario.filename
             line_num = sb_config.behave_line_num
@@ -14222,6 +14231,7 @@ def __process_dashboard(self, has_exception, init=False):
                     alt_test_id = sb_config._display_id[test_id]
                     alt_test_id = alt_test_id.replace(".py::", ".")
                     alt_test_id = alt_test_id.replace("::", ".")
+                    alt_test_id = alt_test_id.replace(" ", "_")
                     if alt_test_id in sb_config._results.keys():
                         sb_config._results.pop(alt_test_id)
             if test_id in sb_config._results.keys() and (

setup.py

@@ -220,7 +220,7 @@
         'markdown-it-py==2.2.0;python_version>="3.7"',  # For new "rich"
         'mdurl==0.1.2;python_version>="3.7"',  # For new "rich"
         'rich==12.6.0;python_version<"3.7"',
-        'rich==13.3.1;python_version>="3.7"',
+        'rich==13.3.2;python_version>="3.7"',
     ],
     extras_require={
         # pip install -e .[allure]