flakey tests

Stop using the same filename!

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');
 ?>

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" );
 

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');
 ?>

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');
 ?>

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)