Merge pull request #30 from codebendercc/fixed-comments-in-libraries-without-examples

Fixed comments in libraries without examples

Author: freskoulix

codebender_testing/disqus.py

@@ -71,18 +71,18 @@ def update_comment(self, sketch, results, current_date, log_entry, openFailFlag,
         if library_match:
             library = library_match.group(1)
 
-        #Check if the currently compiled example belongs to the same library as the previous one.
+        # Check if the currently compiled example belongs to the same library as the previous one.
         # To do so we check if value of library is the same with self.last library value which is updated
         # every time that we log the results of a compiled example.
         if library != self.last_library:
             library_to_comment = library
 
-        #Check if we should add a comment to the library.
+        # Check if we should add a comment to the library.
         if library_to_comment and library not in self.examples_without_library:
             log_entry = self.handle_library_comment(library_to_comment, current_date, log_entry)
 
         self.last_library = library
-        #Add a comment to the currently compiled library example.
+        # Add a comment to the currently compiled library example.
         if not openFailFlag:
             log_entry = self.handle_example_comment(sketch, results, current_date, log_entry)
 
@@ -112,21 +112,21 @@ def handle_library_comment(self, library, current_date, log, examples=True):
                 comment_updated = False
 
                 new_message = self.messages['library'].replace('TEST_DATE', current_date)
-                if examples==False:
+                if examples == False:
                     new_message = self.messages['library_no_examples'].replace('TEST_DATE', current_date)
 
                 for thread in paginator:
 
                     # Check if library has already a comment.
                     post_id, existing_message = self.get_posts(thread['id'])
 
-                    #If library already has a comment, update it.
+                    # If library already has a comment, update it.
                     if post_id and existing_message:
                         log[url]['comment'] = self.update_post(post_id, new_message)
                         comment_updated = True
                         break
 
-                #If library doesn't have a comment, create it.
+                # If library doesn't have a comment, create it.
                 if not comment_updated:
                     log[url]['comment'] = self.create_post(identifier, new_message)
 

codebender_testing/utils.py

@@ -93,6 +93,11 @@ def throttle_compile():
 with open(BOARDS_PATH) as f:
     BOARDS_DB = simplejson.loads(f.read())
 
+# Display progress
+def display_progress(status):
+    sys.stdout.write(status)
+    sys.stdout.flush()
+
 def read_last_log(compile_type):
     logs = os.listdir(get_path('logs'))
     logs_re = re.compile(r'.+cb_compile_tester.+')
@@ -545,7 +550,7 @@ def open_all_libraries_and_examples(self, url, logfile):
                 url_name = url.split('/')[-1]
                 name = self.get_element(By.CSS_SELECTOR, '#mycontainer h1 small').text
                 name = re.sub('[()]', '', name).split('.')[0]
-                if (name != url_name):
+                if name != url_name:
                     print "Didn't open url: ", url
 
             test_status = True
@@ -641,27 +646,36 @@ def comment_compile_libraries_examples(self, sketches, library_examples_dic={},
         library_re = re.compile(r'^.+/library/.+$')
 
         for url in urls_to_visit:
-
             if library_re.match(url):
                 library = url.split('/')[-1]
-                for key, value in library_examples_dic.iteritems():
-                    if(key == library and len(value) == 0):
+                try:
+                    # Comment libraries without examples
+                    if len(library_examples_dic[library]) == 0:
                         if logfile is None or not self.run_full_compile_tests:
                             toc = time.time()
                             continue
 
                         # Update Disqus comments.
                         current_date = strftime('%Y-%m-%d', log_time)
                         if comment and compile_type in ['library', 'target_library']:
-                            library=key
-                            examples=False
+                            self.open(url)
+                            self.get_element(By.CSS_SELECTOR, '#mycontainer h1')
+                            examples = False
                             log_entry = disqus_wrapper.handle_library_comment(library, current_date, log_entry, examples)
                         self.create_log(log_file, log_entry, compile_type)
-                        toc = time.time()
-                        if (toc - tic) >= SAUCELABS_TIMEOUT_SECONDS:
-                            print '\nStopping tests to avoid saucelabs timeout'
-                            print 'Test duration:', int(toc - tic), 'sec'
-                            return
+
+                        test_status = '.'
+                        if not log_entry[url]['comment']:
+                            test_status = 'F'
+                        display_progress(test_status)
+                except Exception as error:
+                    print error
+
+                toc = time.time()
+                if (toc - tic) >= SAUCELABS_TIMEOUT_SECONDS:
+                    print '\nStopping tests to avoid saucelabs timeout'
+                    print 'Test duration:', int(toc - tic), 'sec'
+                    return
             else:
                 sketch = url
                 # Read the boards map in case current sketch/example requires a special board configuration.
@@ -726,9 +740,7 @@ def comment_compile_libraries_examples(self, sketches, library_examples_dic={},
 
                 self.create_log(log_file, log_entry, compile_type)
 
-                # Display progress
-                sys.stdout.write(test_status)
-                sys.stdout.flush()
+                display_progress(test_status)
 
                 toc = time.time()
                 if (toc - tic) >= SAUCELABS_TIMEOUT_SECONDS:
@@ -835,9 +847,7 @@ def compile_sketches(self, sketches, iframe=False, project_view=False, logfile=N
 
             self.create_log(log_file, log_entry, compile_type)
 
-            # Display progress
-            sys.stdout.write(test_status)
-            sys.stdout.flush()
+            display_progress(test_status)
 
             toc = time.time()
             if toc - tic >= SAUCELABS_TIMEOUT_SECONDS: