Merge pull request #137 from seleniumbase/reliability

Improve Reliability

Author: mdmintz

.travis.yml

@@ -28,8 +28,8 @@ before_script:
   - sudo cp chromedriver /usr/local/bin/
   - sudo chmod +x /usr/local/bin/chromedriver
 script:
-  - "nosetests examples/my_first_test.py --with-selenium --browser=chrome -s"
-  - "pytest examples/my_first_test.py --with-selenium --browser=firefox -s"
-  - "pytest examples/my_first_test.py --with-selenium --browser=phantomjs"
+  - "nosetests examples/my_first_test.py --browser=chrome -s"
+  - "pytest examples/my_first_test.py --browser=firefox -s"
+  - "pytest examples/my_first_test.py --browser=phantomjs"
 notifications:
   email: false

examples/gui_test_runner.py

@@ -6,7 +6,7 @@
 try:
     # Python 2
     from Tkinter import Tk, Frame, Button, Label
-except:
+except Exception:
     # Python 3
     from tkinter import Tk, Frame, Button, Label
 import os

requirements.txt

@@ -6,7 +6,7 @@ nose==1.3.7
 pytest==3.4.0
 pytest-html==1.16.1
 six==1.10.0
-flake8==3.4.1
+flake8==3.5.0
 requests==2.18.4
 BeautifulSoup4==4.6.0
 unittest2==1.1.0

seleniumbase/common/encryption.py

@@ -19,7 +19,7 @@ def str_xor(string, key):
     try:
         result = "".join(
             [chr(ord(c1) ^ ord(c2)) for (c1, c2) in zip(string, key)])
-    except:
+    except Exception:
         string = string.decode('utf-8')
         result = "".join(
             [chr(ord(c1) ^ ord(c2)) for (c1, c2) in zip(string, key)])
@@ -80,7 +80,7 @@ def ord_string_sum(string):
     try:
         for c in string:
             count += ord(c)
-    except:
+    except Exception:
         string = string.decode('utf-8')
         for c in string:
             count += ord(c)

seleniumbase/common/obfuscate.py

@@ -26,7 +26,7 @@ def main():
             time.sleep(0.07)
             print(encryption.decrypt(password))
             time.sleep(0.21)
-    except:
+    except KeyboardInterrupt:
         print("\nExiting...\n")
 
 

seleniumbase/common/unobfuscate.py

@@ -16,7 +16,7 @@ def main():
     try:
         # Python 2 has the raw_input() method. Python 3 does not.
         input_method = raw_input  # noqa: ignore=F821
-    except:
+    except Exception:
         input_method = input  # Using Python 3
     try:
         while(1):
@@ -26,7 +26,7 @@ def main():
             time.sleep(0.07)
             print(encryption.decrypt(code))
             time.sleep(0.21)
-    except:
+    except KeyboardInterrupt:
         print("\nExiting...\n")
 
 

seleniumbase/config/settings.py

@@ -11,7 +11,7 @@
 # Default seconds to wait for page elements to appear before performing actions
 TINY_TIMEOUT = 0.1
 MINI_TIMEOUT = 2
-SMALL_TIMEOUT = 5
+SMALL_TIMEOUT = 6
 LARGE_TIMEOUT = 10
 EXTREME_TIMEOUT = 30
 

seleniumbase/core/browser_launcher.py

@@ -147,7 +147,7 @@ def get_local_driver(browser_name, headless):
                 firefox_driver = webdriver.Firefox(
                     firefox_profile=profile, capabilities=firefox_capabilities)
             return firefox_driver
-        except:
+        except Exception:
             return webdriver.Firefox()
     if browser_name == constants.Browser.INTERNET_EXPLORER:
         return webdriver.Ie()

seleniumbase/core/log_helper.py

@@ -26,7 +26,7 @@ def log_test_failure_data(test, test_logpath, driver, browser):
                 traceback_list = traceback.format_list(
                     traceback.extract_tb(traceback_address)[1:])
                 traceback_message = ''.join(traceback_list).strip()
-            except:
+            except Exception:
                 exc_message = "(Unknown Exception)"
                 traceback_message = "(Unknown Traceback)"
             data_to_save.append("Traceback: " + traceback_message)

seleniumbase/core/s3_manager.py

@@ -10,8 +10,8 @@
 
 class S3LoggingBucket(object):
     """
-    A class to upload our log files from tests to S3, from
-    whence we can share them.
+    A class to upload log files from tests to S3.
+    Those files can then be shared easily.
     """
 
     def __init__(self,
@@ -26,16 +26,16 @@ def __init__(self,
         self.bucket_url = bucket_url
 
     def get_key(self, _name):
-        """create a new Key instance with the given name"""
+        """ Create a new Key instance with the given name. """
         return Key(bucket=self.bucket, name=_name)
 
     def get_bucket(self):
-        """return the bucket we're using"""
+        """ Return the bucket being used. """
         return self.bucket
 
     def upload_file(self, file_name, file_path):
-        """upload a given file from the file_path to the bucket
-        with the new name/path file_name"""
+        """ Upload a given file from the file_path to the bucket
+        with the new name/path file_name. """
         upload_key = Key(bucket=self.bucket, name=file_name)
         content_type = "text/plain"
         if file_name.endswith(".html"):
@@ -51,13 +51,13 @@ def upload_file(self, file_name, file_path):
             upload_key.generate_url(expires_in=3600).split("?")[0]
         try:
             upload_key.make_public()
-        except:
+        except Exception:
             pass
         return file_name
 
     def upload_index_file(self, test_address, timestamp):
-        """create an index.html file with links to all the log files we
-        just uploaded"""
+        """ Create an index.html file with links to all the log files we
+        just uploaded. """
         global already_uploaded_files
         already_uploaded_files = list(set(already_uploaded_files))
         already_uploaded_files.sort()
@@ -74,8 +74,8 @@ def upload_index_file(self, test_address, timestamp):
         return "%s%s" % (self.bucket_url, file_name)
 
     def save_uploaded_file_names(self, files):
-        """We keep record of file names that have been uploaded. We upload log
-        files related to each test after its execution. Once we're done, we
-        use already_uploaded_files to create an index file"""
+        """ Keep a record of all file names that've been uploaded. Upload log
+        files related to each test after its execution. Once done, use
+        already_uploaded_files to create an index file. """
         global already_uploaded_files
         already_uploaded_files.extend(files)

seleniumbase/fixtures/base_case.py

@@ -339,10 +339,10 @@ def get_image_url(self, selector, by=By.CSS_SELECTOR,
                                   attribute='src', by=by, timeout=timeout)
 
     def add_text(self, selector, new_value, by=By.CSS_SELECTOR,
-                 timeout=settings.SMALL_TIMEOUT):
+                 timeout=settings.LARGE_TIMEOUT):
         """ The more-reliable version of driver.send_keys()
             Similar to update_text(), but won't clear the text field first. """
-        if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
+        if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self._get_new_timeout(timeout)
         if page_utils.is_xpath_selector(selector):
             by = By.XPATH
@@ -382,16 +382,16 @@ def add_text(self, selector, new_value, by=By.CSS_SELECTOR,
                 self._demo_mode_pause_if_active(tiny=True)
 
     def send_keys(self, selector, new_value, by=By.CSS_SELECTOR,
-                  timeout=settings.SMALL_TIMEOUT):
+                  timeout=settings.LARGE_TIMEOUT):
         """ Same as add_text() -> more reliable, but less name confusion. """
-        if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
+        if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self._get_new_timeout(timeout)
         if page_utils.is_xpath_selector(selector):
             by = By.XPATH
         self.add_text(selector, new_value, by=by, timeout=timeout)
 
     def update_text_value(self, selector, new_value, by=By.CSS_SELECTOR,
-                          timeout=settings.SMALL_TIMEOUT, retry=False):
+                          timeout=settings.LARGE_TIMEOUT, retry=False):
         """ This method updates an element's text value with a new value.
             @Params
             selector - the selector with the value to update
@@ -400,7 +400,7 @@ def update_text_value(self, selector, new_value, by=By.CSS_SELECTOR,
             timeout - how long to wait for the selector to be visible
             retry - if True, use jquery if the selenium text update fails
         """
-        if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
+        if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self._get_new_timeout(timeout)
         if page_utils.is_xpath_selector(selector):
             by = By.XPATH
@@ -456,11 +456,11 @@ def update_text_value(self, selector, new_value, by=By.CSS_SELECTOR,
                 self._demo_mode_pause_if_active(tiny=True)
 
     def update_text(self, selector, new_value, by=By.CSS_SELECTOR,
-                    timeout=settings.SMALL_TIMEOUT, retry=False):
+                    timeout=settings.LARGE_TIMEOUT, retry=False):
         """ The shorter version of update_text_value(), which
             clears existing text and adds new text into the text field.
             We want to keep the old version for backward compatibility. """
-        if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
+        if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self._get_new_timeout(timeout)
         if page_utils.is_xpath_selector(selector):
             by = By.XPATH
@@ -746,9 +746,9 @@ def convert_to_css_selector(self, selector, by):
                     selector, by))
 
     def set_value(self, selector, new_value, by=By.CSS_SELECTOR,
-                  timeout=settings.SMALL_TIMEOUT):
+                  timeout=settings.LARGE_TIMEOUT):
         """ This method uses jQuery to update a text field. """
-        if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
+        if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self._get_new_timeout(timeout)
         if page_utils.is_xpath_selector(selector):
             by = By.XPATH
@@ -772,12 +772,12 @@ def set_value(self, selector, new_value, by=By.CSS_SELECTOR,
         self._demo_mode_pause_if_active()
 
     def jquery_update_text_value(self, selector, new_value, by=By.CSS_SELECTOR,
-                                 timeout=settings.SMALL_TIMEOUT):
+                                 timeout=settings.LARGE_TIMEOUT):
         """ This method uses jQuery to update a text field.
             If the new_value string ends with the newline character,
             WebDriver will finish the call, which simulates pressing
             {Enter/Return} after the text is entered.  """
-        if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
+        if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self._get_new_timeout(timeout)
         if page_utils.is_xpath_selector(selector):
             by = By.XPATH
@@ -805,10 +805,10 @@ def jquery_update_text_value(self, selector, new_value, by=By.CSS_SELECTOR,
         self._demo_mode_pause_if_active()
 
     def jquery_update_text(self, selector, new_value, by=By.CSS_SELECTOR,
-                           timeout=settings.SMALL_TIMEOUT):
+                           timeout=settings.LARGE_TIMEOUT):
         """ The shorter version of jquery_update_text_value()
             (The longer version remains for backwards compatibility.) """
-        if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
+        if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self._get_new_timeout(timeout)
         self.jquery_update_text_value(
             selector, new_value, by=by, timeout=timeout)
@@ -847,29 +847,29 @@ def hover_and_click(self, hover_selector, click_selector,
 
     def pick_select_option_by_text(self, dropdown_selector, option,
                                    dropdown_by=By.CSS_SELECTOR,
-                                   timeout=settings.SMALL_TIMEOUT):
+                                   timeout=settings.LARGE_TIMEOUT):
         """ Picks an HTML <select> option by option text. """
-        if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
+        if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self._get_new_timeout(timeout)
         self._pick_select_option(dropdown_selector, option,
                                  dropdown_by=dropdown_by, option_by="text",
                                  timeout=timeout)
 
     def pick_select_option_by_index(self, dropdown_selector, option,
                                     dropdown_by=By.CSS_SELECTOR,
-                                    timeout=settings.SMALL_TIMEOUT):
+                                    timeout=settings.LARGE_TIMEOUT):
         """ Picks an HTML <select> option by option index. """
-        if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
+        if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self._get_new_timeout(timeout)
         self._pick_select_option(dropdown_selector, option,
                                  dropdown_by=dropdown_by, option_by="index",
                                  timeout=timeout)
 
     def pick_select_option_by_value(self, dropdown_selector, option,
                                     dropdown_by=By.CSS_SELECTOR,
-                                    timeout=settings.SMALL_TIMEOUT):
+                                    timeout=settings.LARGE_TIMEOUT):
         """ Picks an HTML <select> option by option value. """
-        if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
+        if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
             timeout = self._get_new_timeout(timeout)
         self._pick_select_option(dropdown_selector, option,
                                  dropdown_by=dropdown_by, option_by="value",
@@ -1170,7 +1170,7 @@ def _get_new_timeout(self, timeout):
                 timeout_multiplier = 0.5
             timeout = int(math.ceil(timeout_multiplier * timeout))
             return timeout
-        except:
+        except Exception:
             # Wrong data type for timeout_multiplier (expecting int or float)
             return timeout
 
@@ -1185,7 +1185,7 @@ def _get_exception_message(self):
             if exception_info:
                 try:
                     exc_message = exception_info[0][1][1]
-                except:
+                except Exception:
                     exc_message = "(Unknown Exception)"
             else:
                 exc_message = "(Unknown Exception)"
@@ -1474,7 +1474,7 @@ def _add_pytest_html_extra(self):
                                                        name='Screenshot')
                 self._html_report_extra.append(extra_url)
                 self._html_report_extra.append(extra_image)
-        except:
+        except Exception:
             pass
 
     def tearDown(self):
@@ -1541,8 +1541,8 @@ def tearDown(self):
                     self.driver.quit()
                 except AttributeError:
                     pass
-                except:
-                    print("No driver to quit.")
+                except Exception:
+                    pass
                 self.driver = None
             if self.headless:
                 if self.headless_active:
@@ -1587,6 +1587,6 @@ def tearDown(self):
                 self.driver.quit()
             except AttributeError:
                 pass
-            except:
-                print("No driver to quit.")
+            except Exception:
+                pass
             self.driver = None

seleniumbase/plugins/pytest_plugin.py

@@ -159,16 +159,16 @@ def pytest_runtest_teardown(item):
         try:
             if hasattr(self, 'driver') and self.driver:
                 self.driver.quit()
-        except:
+        except Exception:
             pass
         try:
             if hasattr(self, 'headless') and self.headless:
                 if self.headless_active:
                     if hasattr(self, 'display') and self.display:
                         self.display.stop()
-        except:
+        except Exception:
             pass
-    except:
+    except Exception:
         pass
 
 
@@ -182,5 +182,5 @@ def pytest_runtest_makereport(item, call):
             extra_report = item._testcase._html_report_extra
             extra = getattr(report, 'extra', [])
             report.extra = extra + extra_report
-        except:
+        except Exception:
             pass

seleniumbase/plugins/selenium_plugin.py

@@ -125,7 +125,7 @@ def afterTest(self, test):
             self.driver.quit()
         except AttributeError:
             pass
-        except:
+        except Exception:
             pass
         if self.options.headless:
             if self.headless_active:

server_requirements.txt

@@ -6,7 +6,7 @@ nose==1.3.7
 pytest==3.4.0
 pytest-html==1.16.1
 six==1.10.0
-flake8==3.4.1
+flake8==3.5.0
 requests==2.18.4
 BeautifulSoup4==4.6.0
 unittest2==1.1.0