Merge pull request #120 from seleniumbase/upgrade-requirements

Upgrade requirements and fix Python 3 issues

Author: mdmintz

examples/example_logs/ReadMe.txt

@@ -3,4 +3,4 @@ The log files you see here were generated when test_fail.py ran and failed. You
 Expected Log Files:
 basic_test_info.txt
 page_source.html
-screenshot.jpg
+screenshot.png

examples/example_logs/screenshot.jpg renamed to examples/example_logs/screenshot.png

@@ -53,7 +53,8 @@ def __init__(self, master):
         self.run5 = Button(
             frame, command=self.run_5,
             text=("nosetests my_test_suite.py --with-selenium"
-                  " --browser=chrome --with-testing_base --report")).pack()
+                  " --browser=chrome --with-testing_base "
+                  "--report --show_report")).pack()
         self.title6 = Label(
             frame,
             text="Basic Failing Test Run showing the Multiple-Checks feature:",
@@ -94,7 +95,7 @@ def run_4(self):
     def run_5(self):
         os.system(
             'nosetests my_test_suite.py --with-selenium'
-            ' --browser=chrome --with-testing_base --report')
+            ' --browser=chrome --with-testing_base --report --show_report')
 
     def run_6(self):
         os.system(
@@ -109,6 +110,6 @@ def run_7(self):
 
 if __name__ == "__main__":
     root = Tk()
-    root.minsize(612, 444)
+    root.minsize(700, 444)
     app = App(root)
     root.mainloop()

examples/gui_test_runner.py

@@ -1,16 +1,16 @@
 pip>=9.0.1
-setuptools>=36.2.0
+setuptools>=36.3.0
 ipython==5.4.1
-selenium==3.4.3
+selenium==3.5.0
 nose==1.3.7
-pytest==3.1.3
-pytest-html==1.15.1
+pytest==3.2.1
+pytest-html==1.15.2
 six==1.10.0
-flake8==3.3.0
-requests==2.18.1
+flake8==3.4.1
+requests==2.18.4
 BeautifulSoup4==4.6.0
 unittest2==1.1.0
-chardet==3.0.2
+chardet==3.0.4
 boto==2.48.0
 ipdb==0.10.2
 pyvirtualdisplay==0.2.1

requirements.txt

@@ -31,7 +31,7 @@ def function_to_retry(*args, **kwargs):
             while local_tries > 1:
                 try:
                     return func(*args, **kwargs)
-                except Exception, e:
+                except Exception as e:
                     if local_delay > max_delay:
                         local_delay = max_delay
                     logging.exception('%s: Retrying in %d seconds...'

seleniumbase/common/decorators.py

@@ -38,7 +38,7 @@
 # Default names for files saved during test failures when logging is turned on.
 # (These files will get saved to the "latest_logs/" folder)
 # Usage: "--with-testing_base"
-SCREENSHOT_NAME = "screenshot.jpg"
+SCREENSHOT_NAME = "screenshot.png"
 BASIC_INFO_NAME = "basic_test_info.txt"
 PAGE_SOURCE_NAME = "page_source.html"
 

seleniumbase/config/settings.py

@@ -33,7 +33,7 @@ def process_successes(test, test_count, duration):
 
 
 def process_failures(test, test_count, browser_type, duration):
-    bad_page_image = "failure_%s.jpg" % test_count
+    bad_page_image = "failure_%s.png" % test_count
     bad_page_data = "failure_%s.txt" % test_count
     page_actions.save_screenshot(
         test.driver, bad_page_image, folder=LATEST_REPORT_DIR)

seleniumbase/core/report_helper.py

@@ -40,8 +40,10 @@ def upload_file(self, file_name, file_path):
         content_type = "text/plain"
         if file_name.endswith(".html"):
             content_type = "text/html"
-        if file_name.endswith(".jpg"):
-            content_type = "image/jpg"
+        elif file_name.endswith(".jpg"):
+            content_type = "image/jpeg"
+        elif file_name.endswith(".png"):
+            content_type = "image/png"
         upload_key.set_contents_from_filename(
             file_path,
             headers={"Content-Type": content_type})

seleniumbase/core/s3_manager.py

@@ -466,15 +466,15 @@ def fixup(text):
                 # character reference
                 try:
                     if text[:3] == "&#x":
-                        return unichr(int(text[3:-1], 16))
+                        return chr(int(text[3:-1], 16))
                     else:
-                        return unichr(int(text[2:-1]))
+                        return chr(int(text[2:-1]))
                 except ValueError:
                     pass
             else:
                 # named entity
                 try:
-                    text = unichr(htmlentitydefs.name2codepoint[text[1:-1]])
+                    text = chr(htmlentitydefs.name2codepoint[text[1:-1]])
                 except KeyError:
                     pass
             return text  # leave as is

seleniumbase/fixtures/email_manager.py

@@ -111,7 +111,7 @@ def manual_page_check(self, *args):
                     "*"))
             return 1
         else:
-            bad_page_name = "failed_check_%s.jpg" % self.manual_check_count
+            bad_page_name = "failed_check_%s.png" % self.manual_check_count
             self.save_screenshot(bad_page_name, folder=LATEST_REPORT_DIR)
             self.page_results_list.append(
                 '"%s","%s","%s","%s","%s","%s","%s","%s"' % (
@@ -150,7 +150,7 @@ def add_failure(self, exception=None):
                 exc_info = '(Unknown Exception)'
 
         self.incomplete_runs += 1
-        error_page = "automation_failure_%s.jpg" % self.incomplete_runs
+        error_page = "automation_failure_%s.png" % self.incomplete_runs
         self.save_screenshot(error_page, folder=LATEST_REPORT_DIR)
         self.page_results_list.append(
             '"%s","%s","%s","%s","%s","%s","%s","%s"' % (

seleniumbase/masterqa/master_qa.py

@@ -157,6 +157,7 @@ def beforeTest(self, test):
                 os.kill(os.getpid(), 9)
         else:
             connected = False
+            error = "(Unknown)"
             for i in range(1, 4):
                 try:
                     self.driver = self.__select_browser(self.options.browser)
@@ -170,13 +171,14 @@ def beforeTest(self, test):
                     connected = True
                     break
                 except Exception as err:
+                    error = err
                     print("Attempt #%s to connect to Selenium failed" % i)
                     if i < 3:
                         print("Retrying in 3 seconds...")
                         time.sleep(3)
             if not connected:
                 print("Error starting/connecting to Selenium:")
-                print(err)
+                print(error)
                 print("\n\n")
                 os.kill(os.getpid(), 9)
 

seleniumbase/plugins/selenium_plugin.py

@@ -1,16 +1,16 @@
 pip>=9.0.1
-setuptools>=36.2.0
+setuptools>=36.3.0
 ipython==5.4.1
 selenium==2.53.6
 nose==1.3.7
-pytest==3.1.3
-pytest-html==1.15.1
+pytest==3.2.1
+pytest-html==1.15.2
 six==1.10.0
-flake8==3.3.0
-requests==2.18.1
+flake8==3.4.1
+requests==2.18.4
 BeautifulSoup4==4.6.0
 unittest2==1.1.0
-chardet==3.0.2
+chardet==3.0.4
 boto==2.48.0
 ipdb==0.10.2
 pyvirtualdisplay==0.2.1

server_requirements.txt

@@ -8,7 +8,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.4.4',
+    version='1.4.5',
     description='Test Automation Framework - http://seleniumbase.com',
     long_description='Automation Framework for Simple & Reliable Web Testing',
     platforms='Mac * Windows * Linux * Docker',
@@ -19,18 +19,18 @@
     license='The MIT License',
     install_requires=[
         'pip>=9.0.1',
-        'setuptools>=36.2.0',
+        'setuptools>=36.3.0',
         'ipython==5.4.1',
         'selenium==2.53.6',
         'nose==1.3.7',
-        'pytest==3.1.3',
-        'pytest-html==1.15.1',
+        'pytest==3.2.1',
+        'pytest-html==1.15.2',
         'six==1.10.0',
-        'flake8==3.3.0',
-        'requests==2.18.1',
+        'flake8==3.4.1',
+        'requests==2.18.4',
         'BeautifulSoup4==4.6.0',
         'unittest2==1.1.0',
-        'chardet==3.0.2',
+        'chardet==3.0.4',
         'boto==2.48.0',
         'ipdb==0.10.2',
         'pyvirtualdisplay==0.2.1',

server_setup.py

@@ -7,7 +7,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.4.4',
+    version='1.4.5',
     description='Test Automation Framework - http://seleniumbase.com',
     long_description='Automation Framework for Simple & Reliable Web Testing',
     platforms='Mac * Windows * Linux * Docker',
@@ -18,18 +18,18 @@
     license='The MIT License',
     install_requires=[
         'pip>=9.0.1',
-        'setuptools>=36.2.0',
+        'setuptools>=36.3.0',
         'ipython==5.4.1',
-        'selenium==3.4.3',
+        'selenium==3.5.0',
         'nose==1.3.7',
-        'pytest==3.1.3',
-        'pytest-html==1.15.1',
+        'pytest==3.2.1',
+        'pytest-html==1.15.2',
         'six==1.10.0',
-        'flake8==3.3.0',
-        'requests==2.18.1',
+        'flake8==3.4.1',
+        'requests==2.18.4',
         'BeautifulSoup4==4.6.0',
         'unittest2==1.1.0',
-        'chardet==3.0.2',
+        'chardet==3.0.4',
         'boto==2.48.0',
         'ipdb==0.10.2',
         'pyvirtualdisplay==0.2.1',