From d95fd236d29c50761848db76b32c10955edd49cd Mon Sep 17 00:00:00 2001
From: Paul Tarjan <ptarjan@fb.com>
Date: Mon, 3 Jun 2013 19:52:33 -0700
Subject: [PATCH] flakey tests

Stop using the same filename!
---
 .../zend/bad/ext-spl/SplFileObject_getflags_error002.php    | 6 +++---
 .../test/zend/bad/ext-spl/SplFileObject_rewind_error001.php | 4 ++--
 .../test/zend/good/ext-spl/SplFileObject_getflags_basic.php | 6 +++---
 .../zend/good/ext-spl/SplFileObject_getflags_error001.php   | 6 +++---
 hphp/tools/import_zend_test.py                              | 3 +++
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/hphp/test/zend/bad/ext-spl/SplFileObject_getflags_error002.php b/hphp/test/zend/bad/ext-spl/SplFileObject_getflags_error002.php
index cab332902..b7f475aaf 100644
--- a/hphp/test/zend/bad/ext-spl/SplFileObject_getflags_error002.php
+++ b/hphp/test/zend/bad/ext-spl/SplFileObject_getflags_error002.php
@@ -1,12 +1,12 @@
 <?php
 
-file_put_contents('testdata.csv', 'eerste;tweede;derde');
+file_put_contents('SplFileObject_getflags_error002.csv', 'eerste;tweede;derde');
 
-$fo = new SplFileObject('testdata.csv');
+$fo = new SplFileObject('SplFileObject_getflags_error002.csv');
 $fo->setFlags(SplFileObject::READ_CSV);
 
 $fo->getFlags('fake');
 
 ?><?php
-unlink('testdata.csv');
+unlink('SplFileObject_getflags_error002.csv');
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-spl/SplFileObject_rewind_error001.php b/hphp/test/zend/bad/ext-spl/SplFileObject_rewind_error001.php
index 255e55223..ac620084c 100644
--- a/hphp/test/zend/bad/ext-spl/SplFileObject_rewind_error001.php
+++ b/hphp/test/zend/bad/ext-spl/SplFileObject_rewind_error001.php
@@ -1,8 +1,8 @@
 <?php
 
-file_put_contents('testdata.csv', 'eerste;tweede;derde');
+file_put_contents('SplFileObject_rewind_error001.csv', 'eerste;tweede;derde');
 
-$fo = new SplFileObject('testdata.csv');
+$fo = new SplFileObject('SplFileObject_rewind_error001.csv');
 
 $fo->rewind( "invalid" );
 
diff --git a/hphp/test/zend/good/ext-spl/SplFileObject_getflags_basic.php b/hphp/test/zend/good/ext-spl/SplFileObject_getflags_basic.php
index e8d82f118..5654e4246 100644
--- a/hphp/test/zend/good/ext-spl/SplFileObject_getflags_basic.php
+++ b/hphp/test/zend/good/ext-spl/SplFileObject_getflags_basic.php
@@ -1,11 +1,11 @@
 <?php
 
-file_put_contents('testdata.csv', 'eerste;tweede;derde');
+file_put_contents('SplFileObject_getflags_basic.csv', 'eerste;tweede;derde');
 
-$fo = new SplFileObject('testdata.csv');
+$fo = new SplFileObject('SplFileObject_getflags_basic.csv');
 
 $fo->setFlags(SplFileObject::DROP_NEW_LINE);
 var_dump($fo->getFlags());
 ?><?php
-unlink('testdata.csv');
+unlink('SplFileObject_getflags_basic.csv');
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-spl/SplFileObject_getflags_error001.php b/hphp/test/zend/good/ext-spl/SplFileObject_getflags_error001.php
index a22bfb17e..7cf0a6325 100644
--- a/hphp/test/zend/good/ext-spl/SplFileObject_getflags_error001.php
+++ b/hphp/test/zend/good/ext-spl/SplFileObject_getflags_error001.php
@@ -1,9 +1,9 @@
 <?php
 
-file_put_contents('testdata.csv', 'eerste;tweede;derde');
+file_put_contents('SplFileObject_getflags_error001.csv', 'eerste;tweede;derde');
 
 
-$fo = new SplFileObject('testdata.csv');
+$fo = new SplFileObject('SplFileObject_getflags_error001.csv');
 $fo->setFlags(SplFileObject::READ_CSV);
 
 $fo->setFlags(SplFileObject::DROP_NEW_LINE);
@@ -11,5 +11,5 @@ $fo->setFlags(SplFileObject::DROP_NEW_LINE);
 var_dump($fo->getFlags());
 
 ?><?php
-unlink('testdata.csv');
+unlink('SplFileObject_getflags_error001.csv');
 ?>
\ No newline at end of file
diff --git a/hphp/tools/import_zend_test.py b/hphp/tools/import_zend_test.py
index 834272c3f..828940b42 100755
--- a/hphp/tools/import_zend_test.py
+++ b/hphp/tools/import_zend_test.py
@@ -573,6 +573,9 @@ def walk(filename, source):
     if '/ext-spl/SplFileObject_fgetcsv_' in full_dest_filename:
         test = test.replace('SplFileObject__fgetcsv.csv',
             os.path.basename(full_dest_filename).replace('.php', '.csv'))
+    if '/ext-spl/SplFileObject_' in full_dest_filename:
+        test = test.replace('testdata.csv',
+            os.path.basename(full_dest_filename).replace('.php', '.csv'))
 
     file(full_dest_filename, 'w').write(test)