Changeset 76625 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Jan 3, 2019 5:24:36 PM (6 years ago)

Author:

vboxsync

Message:

vsheriff: Quick review of sendEmailAlert (formerly emailAlert) to make recent pylint happy. Fixed inconsistent return value, with rcExit being undefined in the success code path.

Location:

trunk/src/VBox/ValidationKit/testmanager

Files:

• batch/virtual_test_sheriff.py (modified) (5 diffs)
• config.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/testmanager/batch/virtual_test_sheriff.py

@@ -367 +367 @@
         return rcExit;
 
-    def emailAlert(self, uidAuthor, sBodyText):
-        asEmailList = [];
+    def sendEmailAlert(self, uidAuthor, sBodyText):
+        """
+        Sends email alert.
+        """
 
         # Get author email
@@ -378 +380 @@
             sFrom = g_ksAlertFrom;
 
+        # Gather recipient list.
+        asEmailList = [];
         for sUser in g_asAlertList:
             self.oDb.execute('SELECT sEmail FROM Users WHERE sUsername=%s', (sUser,));
             sEmail = self.oDb.fetchOne();
-            if sEmail is None:
-                # No address to send an alert.
-                return;
-            asEmailList.append(sEmail[0]);
-
+            if sEmail:
+                asEmailList.append(sEmail[0]);
+        if not asEmailList:
+            return self.eprint('No email addresses to send alter to!');
+
+        # Compose the message.
         oMsg = MIMEMultipart();
         oMsg['From'] = sFrom;
@@ -392 +397 @@
         oMsg.attach(MIMEText(sBodyText, 'plain'))
 
+        # Try send it.
         try:
             oSMTP = smtplib.SMTP(g_ksSmtpHost, g_kcSmtpPort);
@@ -397 +403 @@
             oSMTP.quit()
         except smtplib.SMTPException as oXcpt:
-            rcExit = self.eprint('Failed to send mail: %s' % (oXcpt,));
-
-        return rcExit;
-
+            return self.eprint('Failed to send mail: %s' % (oXcpt,));
+
+        return 0;
 
     def badTestBoxManagement(self):
@@ -529 +534 @@
                 sComment = u'Reset testbox #%u (%s) - iRC=%u sStduot=%s' % ( idTestBox, oTestBox.sName, iRC, sStdout);
                 self.vprint(sComment);
-                self.emailAlert(self.uidSelf, sComment);
+                self.sendEmailAlert(self.uidSelf, sComment);
 
             except Exception as oXcpt:

trunk/src/VBox/ValidationKit/testmanager/config.py

@@ -194 +194 @@
 g_kcSmtpPort            = 25;
 ## Default email 'From' for email alert.
-g_ksAlertFrom           = 'vs[email protected]';
+g_ksAlertFrom           = 'vsh[email protected]';
 ## Subject for email alert.
-g_ksAlertSubject        = 'Virtual Sheriff alert';
+g_ksAlertSubject        = 'Virtual Test Sheriff Alert';
 ## List of users to send alerts.
 g_asAlertList           = ['lelik', 'werner'];