support define_macros / undef_macros in setup.cfg

Lib/test/test_smtplib.py

--- a/Lib/test/test_smtplib.py	Sat Jun 09 17:31:59 2012 +0100
+++ b/Lib/test/test_smtplib.py	Mon May 21 23:01:17 2012 -0400
@@ -229,13 +229,13 @@
 
     def testNOOP(self):
         smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
-        expected = (250, b'OK')
+        expected = (250, b'Ok')
         self.assertEqual(smtp.noop(), expected)
         smtp.quit()
 
     def testRSET(self):
         smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
-        expected = (250, b'OK')
+        expected = (250, b'Ok')
         self.assertEqual(smtp.rset(), expected)
         smtp.quit()
 
@@ -246,18 +246,10 @@
         self.assertEqual(smtp.ehlo(), expected)
         smtp.quit()
 
-    def testNotImplemented(self):
-        # EXPN isn't implemented in DebuggingServer
+    def testVRFY(self):
+        # VRFY isn't implemented in DebuggingServer
         smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
-        expected = (502, b'EXPN not implemented')
-        smtp.putcmd('EXPN')
-        self.assertEqual(smtp.getreply(), expected)
-        smtp.quit()
-
-    def testVRFY(self):
-        smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
-        expected = (252, b'Cannot VRFY user, but will accept message ' + \
-                         b'and attempt delivery')
+        expected = (502, b'Error: command "VRFY" not implemented')
         self.assertEqual(smtp.vrfy('nobody@nowhere.com'), expected)
         self.assertEqual(smtp.verify('nobody@nowhere.com'), expected)
         smtp.quit()
@@ -273,8 +265,7 @@
 
     def testHELP(self):
         smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
-        self.assertEqual(smtp.help(), b'Supported commands: EHLO HELO MAIL ' + \
-                                      b'RCPT DATA RSET NOOP QUIT VRFY')
+        self.assertEqual(smtp.help(), b'Error: command "HELP" not implemented')
         smtp.quit()
 
     def testSend(self):