Merge "Skip MailAddressTest::testNewFromUser on windows"

diff --combined tests/phpunit/includes/mail/MailAddressTest.php
index dd8ab3e,656be32..18d2acd
--- 1/tests/phpunit/includes/mail/MailAddressTest.php
--- 2/tests/phpunit/includes/mail/MailAddressTest.php
+++ b/tests/phpunit/includes/mail/MailAddressTest.php
@@@ -14,6 -14,9 +14,9 @@@ class MailAddressTest extends MediaWiki
         * @covers MailAddress::newFromUser
         */
        public function testNewFromUser() {
+               if ( wfIsWindows() ) {
+                       $this->markTestSkipped( 'This test only works on non-Windows platforms' );
+               }
                $user = $this->getMock( 'User' );
                $user->expects( $this->any() )->method( 'getName' )->will( $this->returnValue( 'UserName' ) );
                $user->expects( $this->any() )->method( 'getEmail' )->will( $this->returnValue( 'foo@bar.baz' ) );
@@@ -60,4 -63,5 +63,4 @@@
                $ma = new MailAddress( 'some@email.com', 'UserName', 'A real name' );
                $this->assertEquals( $ma->toString(), (string)$ma );
        }
 -
 -}
 +}