From 8074b4f27eda3e938327424883633b14d3b7f18b Mon Sep 17 00:00:00 2001
From: Bert Maher <bertrand@fb.com>
Date: Wed, 30 Jul 2014 20:51:35 -0700
Subject: [PATCH] These are flaking out for me locally

Reviewed By: @swtaarrs

Differential Revision: D1468898
---
 hphp/test/tools/import_zend_test.py                      |  2 ++
 .../flaky/ext/spl/tests/SplFileObject_fgetcsv_basic.php  | 16 ++++++++++++++++
 .../spl/tests/SplFileObject_fgetcsv_basic.php.expectf    |  0
 .../spl/tests/SplFileObject_fgetcsv_enclosure_error.php  | 16 ++++++++++++++++
 .../SplFileObject_fgetcsv_enclosure_error.php.expectf    |  0
 .../good/ext/spl/tests/SplFileObject_fgetcsv_basic.php   | 16 ----------------
 .../spl/tests/SplFileObject_fgetcsv_enclosure_error.php  | 16 ----------------
 7 files changed, 34 insertions(+), 32 deletions(-)
 create mode 100644 hphp/test/zend/flaky/ext/spl/tests/SplFileObject_fgetcsv_basic.php
 rename hphp/test/zend/{good => flaky}/ext/spl/tests/SplFileObject_fgetcsv_basic.php.expectf (100%)
 create mode 100644 hphp/test/zend/flaky/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.php
 rename hphp/test/zend/{good => flaky}/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.php.expectf (100%)
 delete mode 100644 hphp/test/zend/good/ext/spl/tests/SplFileObject_fgetcsv_basic.php
 delete mode 100644 hphp/test/zend/good/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.php

diff --git a/hphp/test/tools/import_zend_test.py b/hphp/test/tools/import_zend_test.py
index a0cea1bdeec..12b6d2a3d1a 100755
--- a/hphp/test/tools/import_zend_test.py
+++ b/hphp/test/tools/import_zend_test.py
@@ -113,10 +113,12 @@ flaky_tests = (
     '/ext/standard/tests/network/fsockopen_variation1.php',
     '/ext/standard/tests/network/shutdown.php',
     '/ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.php',
+    '/ext/spl/tests/SplFileObject_fgetcsv_basic.php',
     '/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.php',
     '/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.php',
     '/ext/spl/tests/SplFileObject_fgetcsv_escape_default.php',
     '/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.php',
+    '/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.php',
     '/ext/spl/tests/SplFileObject_setCsvControl_error001.php',
     '/ext/spl/tests/SplFileObject_setCsvControl_error002.php',
     '/ext/spl/tests/SplFileObject_setCsvControl_error003.php',
diff --git a/hphp/test/zend/flaky/ext/spl/tests/SplFileObject_fgetcsv_basic.php b/hphp/test/zend/flaky/ext/spl/tests/SplFileObject_fgetcsv_basic.php
new file mode 100644
index 00000000000..db3ca4b3dcf
--- /dev/null
+++ b/hphp/test/zend/flaky/ext/spl/tests/SplFileObject_fgetcsv_basic.php
@@ -0,0 +1,16 @@
+<?php
+$fp = fopen('SplFileObject__fgetcsv1.csv', 'w+');
+fputcsv($fp, array(
+	'field1',
+	'field2',
+	'field3',
+	5
+));
+fclose($fp);
+
+$fo = new SplFileObject('SplFileObject__fgetcsv1.csv');
+var_dump($fo->fgetcsv());
+?>
+<?php
+unlink('SplFileObject__fgetcsv1.csv');
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext/spl/tests/SplFileObject_fgetcsv_basic.php.expectf b/hphp/test/zend/flaky/ext/spl/tests/SplFileObject_fgetcsv_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/good/ext/spl/tests/SplFileObject_fgetcsv_basic.php.expectf
rename to hphp/test/zend/flaky/ext/spl/tests/SplFileObject_fgetcsv_basic.php.expectf
diff --git a/hphp/test/zend/flaky/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.php b/hphp/test/zend/flaky/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.php
new file mode 100644
index 00000000000..155f2441f1d
--- /dev/null
+++ b/hphp/test/zend/flaky/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.php
@@ -0,0 +1,16 @@
+<?php
+$fp = fopen('SplFileObject__fgetcsv5.csv', 'w+');
+fputcsv($fp, array(
+	'field1',
+	'field2',
+	'field3',
+	5
+), ',', '"');
+fclose($fp);
+
+$fo = new SplFileObject('SplFileObject__fgetcsv5.csv');
+var_dump($fo->fgetcsv(',', 'invalid'));
+?>
+<?php
+unlink('SplFileObject__fgetcsv5.csv');
+?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.php.expectf b/hphp/test/zend/flaky/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.php.expectf
similarity index 100%
rename from hphp/test/zend/good/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.php.expectf
rename to hphp/test/zend/flaky/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.php.expectf
diff --git a/hphp/test/zend/good/ext/spl/tests/SplFileObject_fgetcsv_basic.php b/hphp/test/zend/good/ext/spl/tests/SplFileObject_fgetcsv_basic.php
deleted file mode 100644
index bc4cb592619..00000000000
--- a/hphp/test/zend/good/ext/spl/tests/SplFileObject_fgetcsv_basic.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
-fputcsv($fp, array(
-	'field1',
-	'field2',
-	'field3',
-	5
-));
-fclose($fp);
-
-$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
-var_dump($fo->fgetcsv());
-?>
-<?php
-unlink('SplFileObject__fgetcsv.csv');
-?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.php b/hphp/test/zend/good/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.php
deleted file mode 100644
index d1d544628dd..00000000000
--- a/hphp/test/zend/good/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-$fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
-fputcsv($fp, array(
-	'field1',
-	'field2',
-	'field3',
-	5
-), ',', '"');
-fclose($fp);
-
-$fo = new SplFileObject('SplFileObject__fgetcsv.csv');
-var_dump($fo->fgetcsv(',', 'invalid'));
-?>
-<?php
-unlink('SplFileObject__fgetcsv.csv');
-?>
\ No newline at end of file
-- 
2.11.4.GIT