From 6fca89f259940d11cc91bebb06789f0c5cb7a6e8 Mon Sep 17 00:00:00 2001 From: bsimmers Date: Wed, 5 Jun 2013 14:48:08 -0700 Subject: [PATCH] Disable flaky zend test I've seen it failing on master intermittently --- .../ext-standard-network/gethostbyname_error004.php | 0 .../ext-standard-network/gethostbyname_error004.php.expectf | 0 .../zend/{good => bad}/ext-standard-network/getmxrr.php | 0 .../{good => bad}/ext-standard-network/getmxrr.php.expectf | 0 hphp/tools/import_zend_test.py | 6 ++++-- 5 files changed, 4 insertions(+), 2 deletions(-) rename hphp/test/zend/{good => bad}/ext-standard-network/gethostbyname_error004.php (100%) rename hphp/test/zend/{good => bad}/ext-standard-network/gethostbyname_error004.php.expectf (100%) rename hphp/test/zend/{good => bad}/ext-standard-network/getmxrr.php (100%) rename hphp/test/zend/{good => bad}/ext-standard-network/getmxrr.php.expectf (100%) diff --git a/hphp/test/zend/good/ext-standard-network/gethostbyname_error004.php b/hphp/test/zend/bad/ext-standard-network/gethostbyname_error004.php similarity index 100% rename from hphp/test/zend/good/ext-standard-network/gethostbyname_error004.php rename to hphp/test/zend/bad/ext-standard-network/gethostbyname_error004.php diff --git a/hphp/test/zend/good/ext-standard-network/gethostbyname_error004.php.expectf b/hphp/test/zend/bad/ext-standard-network/gethostbyname_error004.php.expectf similarity index 100% rename from hphp/test/zend/good/ext-standard-network/gethostbyname_error004.php.expectf rename to hphp/test/zend/bad/ext-standard-network/gethostbyname_error004.php.expectf diff --git a/hphp/test/zend/good/ext-standard-network/getmxrr.php b/hphp/test/zend/bad/ext-standard-network/getmxrr.php similarity index 100% rename from hphp/test/zend/good/ext-standard-network/getmxrr.php rename to hphp/test/zend/bad/ext-standard-network/getmxrr.php diff --git a/hphp/test/zend/good/ext-standard-network/getmxrr.php.expectf b/hphp/test/zend/bad/ext-standard-network/getmxrr.php.expectf similarity index 100% rename from hphp/test/zend/good/ext-standard-network/getmxrr.php.expectf rename to hphp/test/zend/bad/ext-standard-network/getmxrr.php.expectf diff --git a/hphp/tools/import_zend_test.py b/hphp/tools/import_zend_test.py index 828940b42..20fc6fdc0 100755 --- a/hphp/tools/import_zend_test.py +++ b/hphp/tools/import_zend_test.py @@ -134,7 +134,7 @@ no_import = ( '/sapi', ) -# For mark these as failing +# For marking tests as always failing. Used to keep flaky tests in bad/. bad_tests = ( # SESSION is bused on husdon '/zend/unset_cv05.php', @@ -170,6 +170,8 @@ bad_tests = ( '/ext-posix/posix_kill_basic.php', '/ext-standard-file/005_variation-win32.php', '/ext-json/fail001.php', + '/ext-standard-network/getmxrr.php', + '/ext-standard-network/gethostbyname_error004.php', # our build machines have no members in group 0... '/ext-posix/posix_getgrgid.php', @@ -188,7 +190,7 @@ bad_tests = ( # time tests are hard to write, these are poorly written '/ext-date/bug48187.php', - # broken on unbuntu 12.04 + # broken on ubuntu 12.04 '/ext-date/DateTimeZone_listAbbreviations_basic1.php', '/ext-date/bug52290.php', '/ext-date/timezone_abbreviations_list_basic1.php',