Merge pull request #24 from codebendercc/tests_improvements

Tests improvements

Author: dastergon

bin/config.cfg.template

@@ -4,9 +4,6 @@ SAUCELABS_USER: ~
 SAUCELABS_KEY: ~
 SAUCELABS_HUB_URL: http://SAUCELABS_USER:[email protected]:80/wd/hub
 LOCAL_HUB_URL: http://127.0.0.1:4444/wd/hub
-DISQUS_SSO_ID: ~
-DISQUS_SSO_USERNAME: ~
-DISQUS_SSO_EMAIL: ~
 CODEBENDER_TEST_USER: ~
 CODEBENDER_TEST_PASS: ~
 EMAIL: ~
@@ -17,13 +14,19 @@ DISQUS_ACCESS_TOKEN: ~
 DISQUS_API_SECRET: ~
 DISQUS_API_PUBLIC: ~
 DISQUS_FORUM: ~
+DISQUS_SSO_ID: ~
+DISQUS_SSO_USERNAME: ~
+DISQUS_SSO_EMAIL: ~
 AUTHOR_URL: ~
 
 [staging]
 DISQUS_ACCESS_TOKEN: ~
 DISQUS_API_SECRET: ~
 DISQUS_API_PUBLIC: ~
 DISQUS_FORUM: ~
+DISQUS_SSO_ID: ~
+DISQUS_SSO_USERNAME: ~
+DISQUS_SSO_EMAIL: ~
 AUTHOR_URL: ~
 
 [local]

bin/seleniumbender.py

@@ -21,9 +21,9 @@ def __init__(self, url, environment):
             '.gitignore'
         ]
 
-    def run(self, operation, libraries=None):
+    def run(self, operation, test=None, libraries=None):
         if operation == 'common':
-            self.common()
+            self.common(test)
         elif operation == 'libraries':
             self.libraries()
         elif operation == 'examples':
@@ -38,6 +38,8 @@ def run(self, operation, libraries=None):
             self.walkthrough()
         elif operation == 'staging':
             self.staging()
+        elif operation == 'delete':
+            self.delete()
 
     def run_command(self, command):
         command = ' '.join(command)
@@ -79,8 +81,11 @@ def send_mail_with_logs(self, identifier):
     def create_command(self, test_directory, *extra_arguments):
         return ['tox', 'tests/' + test_directory, '--', '--url={}'.format(TARGETS[self.url])] + list(extra_arguments)
 
-    def common(self, identifier='common'):
-        command = self.create_command('common', '--plugin')
+    def common(self, test, identifier='common'):
+        test_directory = 'common'
+        if test:
+            test_directory = os.path.join(test_directory, test)
+        command = self.create_command(test_directory, '--plugin')
         retval = self.run_command(command)
         if retval != 0:
             self.send_mail_no_logs(identifier)
@@ -128,6 +133,10 @@ def staging(self):
         command = self.create_command('compile_tester', '-F', '--plugin')
         self.run_command(command)
 
+    def delete(self):
+        command = self.create_command('delete_sketches')
+        self.run_command(command)
+
 OPERATIONS = {
     'common':'\tTest site common functionality',
     'libraries': 'Visit all libraries and their examples',
@@ -136,7 +145,8 @@ def staging(self):
     'compile': '\tCompile specific examples',
     'noplugin': 'Run tests without app/plugin installed',
     'walkthrough': 'Run tests for walkthrough',
-    'staging': '\tRun tests for staging only'
+    'staging': '\tRun tests for staging only',
+    'delete': '\tDelete all sketches from test user'
 }
 
 TARGETS = {
@@ -189,9 +199,12 @@ def main():
     parser.add_argument('--config',
                         default='config.cfg',
                         help='Configuration file to load (default: config.cfg).')
+    parser.add_argument('--test',
+                        default=None,
+                        help='Common test to run when using operation: common (default: all)')
     parser.add_argument('--libraries',
                         default=None,
-                        help='Libraries to test (comma separated machine names) when using option: target')
+                        help='Libraries to test (comma separated machine names) when using operation: target')
     parser.add_argument('--saucelabs',
                         action='store_true',
                         default=False,
@@ -214,6 +227,8 @@ def main():
         parser.print_help()
         sys.exit()
 
+    test = args.test
+
     libraries = args.libraries
     if operation == 'target' and not libraries:
         print('No target libraries specified!\n')
@@ -258,7 +273,7 @@ def main():
 
     # Run tests
     tests = Tests(target, config)
-    tests.run(operation, libraries=libraries)
+    tests.run(operation, test=test, libraries=libraries)
 
 if __name__ == '__main__':
     main()

codebender_testing/config.py

@@ -81,7 +81,9 @@ def jsondump(data):
 
 TIMEOUT = {
     'LOCATE_ELEMENT': 30,
-    'FLASH_FAIL': 30
+    'FLASH_FAIL': 30,
+    'VERIFY': 30,
+    'FLASH': 30,
 }
 
 DEFAULT_USER_AGENT_FIREFOX = 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:43.0) Gecko/20100101 Firefox/43.0 codebender-selenium'

codebender_testing/disqus.py

@@ -58,25 +58,30 @@ def get_disqus_sso(self, user):
         return "{0} {1} {2}".format(message, sig, timestamp)
 
     def update_comment(self, sketch, results, current_date, log_entry, openFailFlag, total_sketches):
-        # Comment libraries
+        """A comment is added to the library as soon as its first example is compiled.
+        `library`: The library in which belongs the currently compiled example.
+        `self.last_library`: The library in which belongs the previously compiled example.
+        `library_to_comment`: The library in which a comment should be added.
+        """
+
         library_match = re.match(r'.+\/example\/(.+)\/.+', sketch)
         library = None
         library_to_comment = None
+
         if library_match:
             library = library_match.group(1)
-        if not self.last_library:
-            self.last_library = library
-            library_to_comment = library
 
+        #Check if the currently compiled example belongs to the same library as the previous one.
         if library != self.last_library:
             library_to_comment = library
 
+        #Check if we should add a comment to the library.
         if library_to_comment:
             log_entry = self.handle_library_comment(library_to_comment, current_date, log_entry)
 
         self.last_library = library
 
-        # Comment examples
+        #Add a comment to the currently compiled library example.
         if not openFailFlag:
             log_entry = self.handle_example_comment(sketch, results, current_date, log_entry)