Merge pull request #32 from codebendercc/email-fix

Fixed send of emails

Author: freskoulix

bin/seleniumbender.py

@@ -65,25 +65,22 @@ def send_mail_with_logs(self, identifier):
         reports = os.path.join(root_dir, 'reports')
         log_regexp = re.compile('.+{identifier}.+'.format(identifier=identifier))
 
-        try:
-            logfile = sorted([filename for filename in os.listdir(logs) if filename not in files_to_ignore and log_regexp.match(filename)], reverse=True)[0]
-            logfile_timestamp = re.match(r'(\d{4}-\d{2}-\d{2}_\d{2}-\d{2}-\d{2})-.+', logfile).group(1)
-
-            report_regexp = re.compile('report_{timestamp}-{identifier}_(\d+)'.format(timestamp=logfile_timestamp, identifier=identifier))
-            reportfile = sorted([filename for filename in os.listdir(reports) if filename not in files_to_ignore and report_regexp.match(filename)], reverse=True)[0]
-            changes = report_regexp.match(reportfile).group(1)
-
-            email_date = time.strftime('%Y-%m-%d %H:%M:%S')
-
-            command = [
-                '(echo "Changes since the last time: {changes}";'.format(changes=changes),
-                'uuencode "{logs}/{logfile}" "{logfile}";'.format(logs=logs, logfile=logfile),
-                'uuencode "{reports}/{reportfile}" "{reportfile}")'.format(reports=reports, reportfile=reportfile),
-                '| mail -s "Selenium Tests Report: {identifier} {email_date} Changes: {changes}" {email}'.format(identifier=identifier, email_date=email_date, changes=changes, email=self.email)
-            ]
-            self.run_command(command)
-        except:
-            pass
+        logfile = sorted([filename for filename in os.listdir(logs) if filename not in self.files_to_ignore and log_regexp.match(filename)], reverse=True)[0]
+        logfile_timestamp = re.match(r'(\d{4}-\d{2}-\d{2}_\d{2}-\d{2}-\d{2})-.+', logfile).group(1)
+
+        report_regexp = re.compile('report_{timestamp}-{identifier}_(\d+)'.format(timestamp=logfile_timestamp, identifier=identifier))
+        reportfile = sorted([filename for filename in os.listdir(reports) if filename not in self.files_to_ignore and report_regexp.match(filename)], reverse=True)[0]
+        changes = report_regexp.match(reportfile).group(1)
+
+        email_date = time.strftime('%Y-%m-%d %H:%M:%S')
+
+        command = [
+            '(echo "Changes since the last time: {changes}";'.format(changes=changes),
+            'uuencode "{logs}/{logfile}" "{logfile}";'.format(logs=logs, logfile=logfile),
+            'uuencode "{reports}/{reportfile}" "{reportfile}")'.format(reports=reports, reportfile=reportfile),
+            '| mail -s "Selenium Tests Report: {identifier} {email_date} Changes: {changes}" {email}'.format(identifier=identifier, email_date=email_date, changes=changes, email=self.email)
+        ]
+        self.run_command(command)
 
     def create_command(self, test_directory, *extra_arguments):
         return ['tox', 'tests/' + test_directory, '--', '--url={}'.format(TARGETS[self.url])] + list(extra_arguments)

codebender_testing/utils.py

@@ -431,7 +431,7 @@ def delete_project(self, project_name):
         except:
             print "An action failed during deletion process of project:", project_name
 
-    def resume_log (self, logfile, compile_type, sketches):
+    def resume_log(self, logfile, compile_type, sketches):
         """Resume previous log, if any. Coves 3 cases:
         Case 1: Test runs for 1st time and there is no previous log file.
         Case 2: Test runs for 2nd time and there is a previous log file which contains

tests/compile_tester/test_compile_tester_projects.py

@@ -1,6 +1,5 @@
 from codebender_testing.config import COMPILE_TESTER_DIR
 from codebender_testing.config import COMPILE_TESTER_LOGFILE
-from codebender_testing.config import COMPILE_TESTER_LOGFILE_STAGING
 from codebender_testing.config import COMPILE_TESTER_URL
 from codebender_testing.config import LIVE_SITE_URL
 from codebender_testing.config import STAGING_SITE_URL
@@ -83,7 +82,7 @@ def test_compile_local_files(self, tester_login):
             '#user_projects tbody a',
             iframe=False,
             compile_type='sketch',
-            create_report=True, logfile=COMPILE_TESTER_LOGFILE_STAGING)
+            create_report=True, logfile=COMPILE_TESTER_LOGFILE)
 
         for name in filenames:
             name = name.split('.')[0]