Enable test_socket again, if only to prevent mistakes like Jeremy

thinking that he was running his new test by running "make test".
Also, I can't get this to fail any more.  Your turn. :-)

Lib/test/test_socket.py

@@ -546,7 +546,7 @@ class FileObjectClassTestCase(SocketConnectedTest):
         self.cli_file.write(MSG)
         self.cli_file.flush()
 
-def main():
+def test_main():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(GeneralModuleTests))
     suite.addTest(unittest.makeSuite(BasicTCPTest))
@@ -556,4 +556,4 @@ def main():
     test_support.run_suite(suite)
 
 if __name__ == "__main__":
-    main()
+    test_main()