Merge pull request #31 from codebendercc/capabilities-update

Capabilities update

Author: freskoulix

bin/seleniumbender.py

@@ -14,6 +14,7 @@
 
 class Tests:
     def __init__(self, url, environment):
+        self.retval = 0
         self.url = url
         self.environment = os.path.abspath(environment)
         self.email = os.getenv('EMAIL', 'void@mail.0')
@@ -47,10 +48,16 @@ def run_command(self, command):
         return subprocess.call(command, shell=True, executable=SHELL)
 
     def send_mail_no_logs(self, identifier):
+        if self.url == 'local':
+            return
+
         command = ['mail', '-s', '"Selenium Tests: {identifier} Failed To Run" {email} <<< "Something went wrong with {identifier} tests. Please check the logs."'.format(identifier=identifier, email=self.email)]
         self.run_command(command)
 
     def send_mail_with_logs(self, identifier):
+        if self.url == 'local':
+            return
+
         default_tests_dir = os.path.normpath(os.path.join(os.path.dirname(__file__), '..'))
         root_dir = os.getenv('ROOTDIR', default_tests_dir)
 
@@ -88,31 +95,41 @@ def common(self, test, identifier='common'):
         command = self.create_command(test_directory, '--plugin')
         retval = self.run_command(command)
         if retval != 0:
+            self.retval = retval
             self.send_mail_no_logs(identifier)
 
     def libraries(self, identifier='libraries_fetch'):
         command = self.create_command('libraries_fetch', '-F', '--plugin')
-        self.run_command(command)
+        retval = self.run_command(command)
+        if retval != 0:
+            self.retval = retval
         self.send_mail_with_logs(identifier)
 
     def examples(self, identifier='libraries_test'):
         command = self.create_command('libraries', '-F', '--plugin')
-        self.run_command(command)
+        retval = self.run_command(command)
+        if retval != 0:
+            self.retval = retval
         self.send_mail_with_logs(identifier)
 
     def sketches(self, identifier='cb_compile_tester'):
         command = self.create_command('compile_tester', '-F', '--plugin')
-        self.run_command(command)
+        retval = self.run_command(command)
+        if retval != 0:
+            self.retval = retval
         self.send_mail_with_logs(identifier)
 
     def compile(self, libraries):
         command = self.create_command('target_libraries', '-F', '--plugin', '--libraries={}'.format(libraries))
-        self.run_command(command)
+        retval = self.run_command(command)
+        if retval != 0:
+            self.retval = retval
 
     def noplugin(self, identifier = 'noplugin'):
         command = self.create_command('noplugin')
         retval = self.run_command(command)
         if retval != 0:
+            self.retval = retval
             self.send_mail_no_logs(identifier)
 
     def walkthrough(self, identifier='walkthrough'):
@@ -127,15 +144,20 @@ def walkthrough(self, identifier='walkthrough'):
 
         retval = max(retvals)
         if retval != 0:
+            self.retval = retval
             self.send_mail_no_logs(identifier)
 
     def staging(self):
         command = self.create_command('compile_tester', '-F', '--plugin')
-        self.run_command(command)
+        retval = self.run_command(command)
+        if retval != 0:
+            self.retval = retval
 
     def delete(self):
         command = self.create_command('delete_sketches')
-        self.run_command(command)
+        retval = self.run_command(command)
+        if retval != 0:
+            self.retval = retval
 
 OPERATIONS = {
     'common':'\tTest site common functionality',
@@ -275,5 +297,8 @@ def main():
     tests = Tests(target, config)
     tests.run(operation, test=test, libraries=libraries)
 
+    print('Tests exit code:', tests.retval)
+    sys.exit(tests.retval)
+
 if __name__ == '__main__':
     main()

codebender_testing/capabilities.yaml

@@ -7,7 +7,7 @@
 #   https://docs.saucelabs.com/reference/test-configuration
 
 - browserName: "firefox"
-  version: 43
+  version: 45
   public: "public restricted"
   maxDuration: 10800
 - browserName: "chrome"

codebender_testing/config.py

@@ -77,7 +77,7 @@ def jsondump(data):
 # Directory in which the local compile tester files are stored.
 COMPILE_TESTER_DIR = os.path.join(TEST_DATA_DIR, 'cb_compile_tester')
 
-TEST_PROJECT_NAME = "test_project"
+TEST_PROJECT_NAME = "test_sketch"
 
 TIMEOUT = {
     'LOCATE_ELEMENT': 30,

tests/common/sketch/test_sketch.py

@@ -26,7 +26,7 @@ class TestSketch(SeleniumTestCase):
     def create_test_project(self, tester_login):
         """Makes sure we are logged in and have a project open before
         performing any of these tests."""
-        self.create_sketch('private' , 'project', 'short description')
+        self.create_sketch('private' , TEST_PROJECT_NAME + '_initial', 'short description')
 
     def test_rename_project(self):
         self.change_name_editor(TEST_PROJECT_NAME)