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)