Code cleanup

jmanvel · May 16, 2013 · 7f39eff · 7f39eff
1 parent 3215f89
commit 7f39eff
Showing 1 changed file with 18 additions and 17 deletions.
diff --git a/test/phpmailerTest.php b/test/phpmailerTest.php
@@ -955,24 +955,25 @@ function test_SmtpKeepAlive()
         $this->Mail->SmtpClose();
     }
 
-  /**
-   * Test SMTP host connections
-   */
-  function test_SmtpConnect()
-  {
-    $this->assertTrue($this->Mail->SmtpConnect(), 'SMTP single connect failed');
-    $this->Mail->SmtpClose();
-    $this->Mail->Host = "localhost:12345;10.10.10.10:54321";
-    $this->assertFalse($this->Mail->SmtpConnect(), 'SMTP bad multi-connect succeeded');
-    $this->Mail->SmtpClose();
-    $this->Mail->Host = "localhost:12345;10.10.10.10:54321;".$_REQUEST['mail_host'];
-    $this->assertTrue($this->Mail->SmtpConnect(), 'SMTP multi-connect failed');
-    $this->Mail->SmtpClose();
-    $this->Mail->Host = $_REQUEST['mail_host'];
-    $this->assertTrue($this->Mail->SmtpConnect(array('ssl' => array('verify_depth' => 10))), 'SMTP connect with options failed');
-  }
+    /**
+     * Test SMTP host connections
+     */
+    function test_SmtpConnect()
+    {
+      $this->assertTrue($this->Mail->SmtpConnect(), 'SMTP single connect failed');
+      $this->Mail->SmtpClose();
+      $this->Mail->Host = "localhost:12345;10.10.10.10:54321";
+      $this->assertFalse($this->Mail->SmtpConnect(), 'SMTP bad multi-connect succeeded');
+      $this->Mail->SmtpClose();
+      $this->Mail->Host = "localhost:12345;10.10.10.10:54321;".$_REQUEST['mail_host'];
+      $this->assertTrue($this->Mail->SmtpConnect(), 'SMTP multi-connect failed');
+      $this->Mail->SmtpClose();
+      $this->Mail->Host = $_REQUEST['mail_host'];
+      //Need to pick a harmless option so as not cause problems of its own! socket:bind doesn't work with Travis-CI
+      $this->assertTrue($this->Mail->SmtpConnect(array('ssl' => array('verify_depth' => 10))), 'SMTP connect with options failed');
+    }
 
-  /**
+    /**
      * Tests this denial of service attack:
      *    http://www.cybsec.com/vuln/PHPMailer-DOS.pdf
      */