Merge pull request #1102 from seleniumbase/fix-log-path-issue-with-sb-fixture-tests

Use the correct log path for tests that use the "sb" fixture

Author: mdmintz

requirements.txt

@@ -88,7 +88,7 @@ decorator==5.1.0;python_version>="3.5"
 ipython==5.10.0;python_version<"3.5"
 ipython==7.9.0;python_version>="3.5" and python_version<"3.6"
 ipython==7.16.1;python_version>="3.6" and python_version<"3.7"
-ipython==7.30.0;python_version>="3.7"
+ipython==7.30.1;python_version>="3.7"
 matplotlib-inline==0.1.3;python_version>="3.7"
 colorama==0.4.4
 platformdirs==2.0.2;python_version<"3.6"
@@ -109,7 +109,7 @@ Pillow==7.2.0;python_version>="3.5" and python_version<"3.6"
 Pillow==8.4.0;python_version>="3.6"
 typing-extensions==3.10.0.2;python_version<"3.6"
 typing-extensions==4.0.0;python_version>="3.6" and python_version<"3.8"
-rich==10.15.1;python_version>="3.6" and python_version<"4.0"
+rich==10.15.2;python_version>="3.6" and python_version<"4.0"
 tornado==5.1.1;python_version<"3.5"
 tornado==6.1;python_version>="3.5"
 pdfminer.six==20191110;python_version<"3.5"

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "2.2.4"
+__version__ = "2.2.5"

seleniumbase/fixtures/base_case.py

@@ -2988,8 +2988,7 @@ def save_screenshot_to_logs(
         (The last_page / failure screenshot is always "screenshot.png")
         The screenshot will be in PNG format."""
         self.wait_for_ready_state_complete()
-        test_id = self.__get_test_id()
-        test_logpath = self.log_path + "/" + test_id
+        test_logpath = os.path.join(self.log_path, self.__get_test_id())
         self.__create_log_path_as_needed(test_logpath)
         if name:
             name = str(name)
@@ -11202,6 +11201,7 @@ 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("::", ".")
         return test_id
 
     def __get_test_id_2(self):
@@ -11627,8 +11627,7 @@ def save_teardown_screenshot(self):
         except Exception:
             return
         if self.__has_exception() or self.save_screenshot_after_test:
-            test_id = self.__get_test_id()
-            test_logpath = self.log_path + "/" + test_id
+            test_logpath = os.path.join(self.log_path, self.__get_test_id())
             self.__create_log_path_as_needed(test_logpath)
             self.__set_last_page_screenshot()
             self.__set_last_page_url()
@@ -11718,7 +11717,7 @@ def tearDown(self):
                     and not has_exception
                     and self.save_screenshot_after_test
                 ):
-                    test_logpath = self.log_path + "/" + test_id
+                    test_logpath = os.path.join(self.log_path, test_id)
                     self.__create_log_path_as_needed(test_logpath)
                     if not self.__last_page_screenshot_png:
                         self.__set_last_page_screenshot()
@@ -11731,7 +11730,7 @@ def tearDown(self):
                     )
                     self.__add_pytest_html_extra()
                 if self.with_testing_base and has_exception:
-                    test_logpath = self.log_path + "/" + test_id
+                    test_logpath = os.path.join(self.log_path, test_id)
                     self.__create_log_path_as_needed(test_logpath)
                     if (
                         not self.with_screen_shots
@@ -11861,7 +11860,7 @@ def tearDown(self):
             # (Nosetests)
             if has_exception:
                 test_id = self.__get_test_id()
-                test_logpath = self.log_path + "/" + test_id
+                test_logpath = os.path.join(self.log_path, test_id)
                 self.__create_log_path_as_needed(test_logpath)
                 log_helper.log_test_failure_data(
                     self,
@@ -11885,7 +11884,7 @@ def tearDown(self):
                     )
             elif self.save_screenshot_after_test:
                 test_id = self.__get_test_id()
-                test_logpath = self.log_path + "/" + test_id
+                test_logpath = os.path.join(self.log_path, test_id)
                 self.__create_log_path_as_needed(test_logpath)
                 if not self.__last_page_screenshot_png:
                     self.__set_last_page_screenshot()

setup.py

@@ -207,7 +207,7 @@
         'ipython==5.10.0;python_version<"3.5"',
         'ipython==7.9.0;python_version>="3.5" and python_version<"3.6"',
         'ipython==7.16.1;python_version>="3.6" and python_version<"3.7"',
-        'ipython==7.30.0;python_version>="3.7"',  # Requires matplotlib-inline
+        'ipython==7.30.1;python_version>="3.7"',  # Requires matplotlib-inline
         'matplotlib-inline==0.1.3;python_version>="3.7"',  # ipython needs this
         "colorama==0.4.4",
         'platformdirs==2.0.2;python_version<"3.6"',
@@ -228,7 +228,7 @@
         'Pillow==8.4.0;python_version>="3.6"',
         'typing-extensions==3.10.0.2;python_version<"3.6"',  # <3.8 for "rich"
         'typing-extensions==4.0.0;python_version>="3.6" and python_version<"3.8"',  # noqa: E501
-        'rich==10.15.1;python_version>="3.6" and python_version<"4.0"',
+        'rich==10.15.2;python_version>="3.6" and python_version<"4.0"',
         'tornado==5.1.1;python_version<"3.5"',
         'tornado==6.1;python_version>="3.5"',
         'pdfminer.six==20191110;python_version<"3.5"',