fill-session-id-none-after-session-quit (#123)

2gis · Feb 20, 2018 · c2770ea · c2770ea
1 parent 02f984c
commit c2770ea
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/contesto/basis/test_case.py b/contesto/basis/test_case.py
@@ -220,6 +220,8 @@ def _destroy_session(cls):
             cls.driver.quit()
         except URLError:
             raise ConnectionError('%s:%s' % (cls.driver_settings['host'], cls.driver_settings['port']))
+        if hasattr(cls.driver, 'session_id'):
+            cls.driver.session_id = None
 
     @classmethod
     def setUpClass(cls):

diff --git a/contesto/utils/log.py b/contesto/utils/log.py
@@ -19,7 +19,7 @@ class ContextFilter(logging.Filter):
     def filter(self, record):
         for frame in inspect.stack()[1:]:
             test = frame[0].f_locals.get("self")
-            if hasattr(test, "driver") and hasattr(test.driver, "session_id"):
+            if hasattr(test, "driver") and hasattr(test.driver, "session_id") and test.driver.session_id:
                 record.session_id = test.driver.session_id
                 break
         else:

diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@
             'config/*.ini'
         ],
     },
-    "version": "0.3.1",
+    "version": "0.3.2",
     "install_requires": [
         "selenium==2.52.0",
         "Appium-Python-Client==0.24",