From 16555d9b6d1cc024b04cff46fd0cfb30444effe9 Mon Sep 17 00:00:00 2001
From: Sean Cannella <seanc@fb.com>
Date: Wed, 2 Oct 2013 20:27:55 -0700
Subject: [PATCH] Fix intermittently failing file tests

File tests run in parallel should use independent paths to avoid creation/teardown interfering with each other

Reviewed By: @ptarjan

Differential Revision: D994417
---
 hphp/runtime/ext/ext_pdo.h                         |  5 ++-
 .../bad/ext/standard/tests/dir/chdir_basic.php     | 20 ++++++------
 .../ext/standard/tests/dir/chdir_basic.php.expectf |  4 +--
 .../ext/standard/tests/dir/chdir_variation2.php    | 36 +++++++++++-----------
 .../tests/dir/chdir_variation2.php.expectf         | 22 ++++++-------
 .../ext/standard/tests/file/fopen_include_path.inc |  2 +-
 .../ext/standard/tests/file/rename_variation1.php  | 12 ++++----
 .../tests/file/rename_variation2-win32.php         | 18 +++++------
 .../ext/standard/tests/file/rename_variation2.php  | 14 ++++-----
 .../ext/standard/tests/file/rename_variation3.php  | 18 +++++------
 .../ext/standard/tests/file/rename_variation4.php  | 12 ++++----
 .../ext/standard/tests/file/rename_variation5.php  | 12 ++++----
 .../streams/stream_get_meta_data_socket_basic.php  |  2 +-
 .../stream_get_meta_data_socket_variation1.php     |  4 +--
 .../stream_get_meta_data_socket_variation2.php     |  4 +--
 .../stream_get_meta_data_socket_variation3.php     |  4 +--
 .../stream_get_meta_data_socket_variation4.php     |  4 +--
 .../ext/standard/tests/file/fopen_include_path.inc |  2 +-
 .../ext/standard/tests/file/fopen_variation16.php  |  2 +-
 .../ext/standard/tests/file/fopen_variation17.php  |  2 +-
 hphp/tools/import_zend_test.py                     |  7 ++++-
 21 files changed, 107 insertions(+), 99 deletions(-)

diff --git a/hphp/runtime/ext/ext_pdo.h b/hphp/runtime/ext/ext_pdo.h
index 9baf97e94f4..87c7bcf5123 100644
--- a/hphp/runtime/ext/ext_pdo.h
+++ b/hphp/runtime/ext/ext_pdo.h
@@ -119,7 +119,10 @@ class c_PDO : public ExtObjectData, public Sweepable {
   // need to implement
   public: c_PDO(Class* cls = c_PDO::classof());
   public: ~c_PDO();
-  public: void t___construct(const String& dsn, const String& username = null_string, const String& password = null_string, CArrRef options = null_array);
+  public: void t___construct(const String& dsn,
+                             const String& username = null_string,
+                             const String& password = null_string,
+                             CArrRef options = null_array);
   public: Variant t_prepare(const String& statement, CArrRef options = null_array);
   public: bool t_begintransaction();
   public: bool t_commit();
diff --git a/hphp/test/zend/bad/ext/standard/tests/dir/chdir_basic.php b/hphp/test/zend/bad/ext/standard/tests/dir/chdir_basic.php
index 53cfa441445..6ab5d48c9f9 100644
--- a/hphp/test/zend/bad/ext/standard/tests/dir/chdir_basic.php
+++ b/hphp/test/zend/bad/ext/standard/tests/dir/chdir_basic.php
@@ -11,28 +11,28 @@
 echo "*** Testing chdir() : basic functionality ***\n";
 $base_dir_path = dirname(__FILE__);
 
-$level_one_dir_name = "level_one";
-$level_one_dir_path = "$base_dir_path/$level_one_dir_name";
+$level1_one_dir_name = "level1_one";
+$level1_one_dir_path = "$base_dir_path/$level1_one_dir_name";
 
-$level_two_dir_name = "level_two";
-$level_two_dir_path = "$base_dir_path/$level_one_dir_name/$level_two_dir_name";
+$level1_two_dir_name = "level1_two";
+$level1_two_dir_path = "$base_dir_path/$level1_one_dir_name/$level1_two_dir_name";
 
 // create directories
-mkdir($level_one_dir_path);
-mkdir($level_two_dir_path);
+mkdir($level1_one_dir_path);
+mkdir($level1_two_dir_path);
 
 echo "\n-- Testing chdir() with absolute path: --\n";
 chdir($base_dir_path);
-var_dump(chdir($level_one_dir_path));
+var_dump(chdir($level1_one_dir_path));
 var_dump(getcwd());
 
 echo "\n-- Testing chdir() with relative paths: --\n";
-var_dump(chdir($level_two_dir_name));
+var_dump(chdir($level1_two_dir_name));
 var_dump(getcwd());
 ?>
 ===DONE===?>
 <?php
 $file_path = dirname(__FILE__);
-rmdir("$file_path/level_one/level_two");
-rmdir("$file_path/level_one");
+rmdir("$file_path/level1_one/level1_two");
+rmdir("$file_path/level1_one");
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext/standard/tests/dir/chdir_basic.php.expectf b/hphp/test/zend/bad/ext/standard/tests/dir/chdir_basic.php.expectf
index 1278fc1f2bc..9830ccec99e 100644
--- a/hphp/test/zend/bad/ext/standard/tests/dir/chdir_basic.php.expectf
+++ b/hphp/test/zend/bad/ext/standard/tests/dir/chdir_basic.php.expectf
@@ -2,9 +2,9 @@
 
 -- Testing chdir() with absolute path: --
 bool(true)
-string(%d) "%slevel_one"
+string(%d) "%slevel1_one"
 
 -- Testing chdir() with relative paths: --
 bool(true)
-string(%d) "%slevel_one%elevel_two"
+string(%d) "%slevel1_one%elevel1_two"
 ===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext/standard/tests/dir/chdir_variation2.php b/hphp/test/zend/bad/ext/standard/tests/dir/chdir_variation2.php
index 950b06078ee..a20673dc1c1 100644
--- a/hphp/test/zend/bad/ext/standard/tests/dir/chdir_variation2.php
+++ b/hphp/test/zend/bad/ext/standard/tests/dir/chdir_variation2.php
@@ -12,32 +12,32 @@ echo "*** Testing chdir() : usage variations ***\n";
 
 $base_dir_path = dirname(__FILE__);
 
-$level_one_dir_name = "level_one";
-$level_one_dir_path = "$base_dir_path/$level_one_dir_name";
+$level2_one_dir_name = "level2_one";
+$level2_one_dir_path = "$base_dir_path/$level2_one_dir_name";
 
-$level_two_dir_name = "level_two";
-$level_two_dir_path = "$base_dir_path/$level_one_dir_name/$level_two_dir_name";
+$level2_two_dir_name = "level2_two";
+$level2_two_dir_path = "$base_dir_path/$level2_one_dir_name/$level2_two_dir_name";
 
 // create directories
-mkdir($level_one_dir_path);
-mkdir($level_two_dir_path);
+mkdir($level2_one_dir_path);
+mkdir($level2_two_dir_path);
 
-echo "\n-- \$directory = './level_one': --\n";
+echo "\n-- \$directory = './level2_one': --\n";
 var_dump(chdir($base_dir_path));
-var_dump(chdir("./$level_one_dir_name"));
+var_dump(chdir("./$level2_one_dir_name"));
 var_dump(getcwd());
 
-echo "\n-- \$directory = 'level_one/level_two': --\n";
+echo "\n-- \$directory = 'level2_one/level2_two': --\n";
 var_dump(chdir($base_dir_path));
-var_dump(chdir("$level_one_dir_name/$level_two_dir_name"));
+var_dump(chdir("$level2_one_dir_name/$level2_two_dir_name"));
 var_dump(getcwd());
 
 echo "\n-- \$directory = '..': --\n";
 var_dump(chdir('..'));
 var_dump(getcwd());
 
-echo "\n-- \$directory = 'level_two', '.': --\n";
-var_dump(chdir($level_two_dir_path));
+echo "\n-- \$directory = 'level2_two', '.': --\n";
+var_dump(chdir($level2_two_dir_path));
 var_dump(chdir('.'));
 var_dump(getcwd());
 
@@ -46,19 +46,19 @@ var_dump(chdir('../'));
 var_dump(getcwd());
 
 echo "\n-- \$directory = './': --\n";
-var_dump(chdir($level_two_dir_path));
+var_dump(chdir($level2_two_dir_path));
 var_dump(chdir('./'));
 var_dump(getcwd());
 
-echo "\n-- \$directory = '../../'level_one': --\n";
-var_dump(chdir($level_two_dir_path));
-var_dump(chdir("../../$level_one_dir_name"));
+echo "\n-- \$directory = '../../'level2_one': --\n";
+var_dump(chdir($level2_two_dir_path));
+var_dump(chdir("../../$level2_one_dir_name"));
 var_dump(getcwd());
 
 ?>
 ===DONE===?>
 <?php
 $file_path = dirname(__FILE__);
-rmdir("$file_path/level_one/level_two");
-rmdir("$file_path/level_one");
+rmdir("$file_path/level2_one/level2_two");
+rmdir("$file_path/level2_one");
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext/standard/tests/dir/chdir_variation2.php.expectf b/hphp/test/zend/bad/ext/standard/tests/dir/chdir_variation2.php.expectf
index b525da303c0..fb3a915da33 100644
--- a/hphp/test/zend/bad/ext/standard/tests/dir/chdir_variation2.php.expectf
+++ b/hphp/test/zend/bad/ext/standard/tests/dir/chdir_variation2.php.expectf
@@ -1,35 +1,35 @@
 *** Testing chdir() : usage variations ***
 
--- $directory = './level_one': --
+-- $directory = './level2_one': --
 bool(true)
 bool(true)
-string(%d) "%slevel_one"
+string(%d) "%slevel2_one"
 
--- $directory = 'level_one/level_two': --
+-- $directory = 'level2_one/level2_two': --
 bool(true)
 bool(true)
-string(%d) "%slevel_one%elevel_two"
+string(%d) "%slevel2_one%elevel2_two"
 
 -- $directory = '..': --
 bool(true)
-string(%d) "%slevel_one"
+string(%d) "%slevel2_one"
 
--- $directory = 'level_two', '.': --
+-- $directory = 'level2_two', '.': --
 bool(true)
 bool(true)
-string(%d) "%slevel_one%elevel_two"
+string(%d) "%slevel2_one%elevel2_two"
 
 -- $directory = '../': --
 bool(true)
-string(%d) "%slevel_one"
+string(%d) "%slevel2_one"
 
 -- $directory = './': --
 bool(true)
 bool(true)
-string(%d) "%slevel_one%elevel_two"
+string(%d) "%slevel2_one%elevel2_two"
 
--- $directory = '../../'level_one': --
+-- $directory = '../../'level2_one': --
 bool(true)
 bool(true)
-string(%d) "%slevel_one"
+string(%d) "%slevel2_one"
 ===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext/standard/tests/file/fopen_include_path.inc b/hphp/test/zend/bad/ext/standard/tests/file/fopen_include_path.inc
index 7d6723a8150..5bc9b6ce3b2 100644
--- a/hphp/test/zend/bad/ext/standard/tests/file/fopen_include_path.inc
+++ b/hphp/test/zend/bad/ext/standard/tests/file/fopen_include_path.inc
@@ -1,6 +1,6 @@
 <?php
 $pwd = getcwd();
-$f = basename(__FILE__);
+$f = basename(current(get_included_files()), ".php");
 $dir1 = $pwd."/".$f.".dir1";
 $dir2 = $pwd."/".$f.".dir2";
 $dir3 = $pwd."/".$f.".dir3";
diff --git a/hphp/test/zend/bad/ext/standard/tests/file/rename_variation1.php b/hphp/test/zend/bad/ext/standard/tests/file/rename_variation1.php
index bc4dbe89c11..5fe8975a16c 100644
--- a/hphp/test/zend/bad/ext/standard/tests/file/rename_variation1.php
+++ b/hphp/test/zend/bad/ext/standard/tests/file/rename_variation1.php
@@ -7,16 +7,16 @@ $file_path = dirname(__FILE__);
 echo "\n*** Testing rename() : renaming directory across directories ***\n";
 $src_dirs = array (
   /* Testing simple directory tree */
-  "$file_path/rename_variation/",
+  "$file_path/rename_variation1/",
 
   /* Testing a dir with trailing slash */
-  "$file_path/rename_variation/",
+  "$file_path/rename_variation1/",
 
   /* Testing dir with double trailing slashes */
-  "$file_path//rename_variation//",
+  "$file_path//rename_variation1//",
 );
 
-$dest_dir = "$file_path/rename_variation_dir";
+$dest_dir = "$file_path/rename_variation1_dir";
 // create the $dest_dir
 mkdir($dest_dir);
 
@@ -26,7 +26,7 @@ foreach($src_dirs as $src_dir) {
   echo "-- Iteration $counter --\n";
 
   // create the src dir
-  mkdir("$file_path/rename_variation/");
+  mkdir("$file_path/rename_variation1/");
   // rename the src dir to a new dir in dest dir
   var_dump( rename($src_dir, $dest_dir."/new_dir") );
   // ensure that dir was renamed 
@@ -41,5 +41,5 @@ foreach($src_dirs as $src_dir) {
 echo "Done\n";
 ?><?php
 $file_path = dirname(__FILE__);
-rmdir($file_path."/rename_variation_dir");
+rmdir($file_path."/rename_variation1_dir");
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext/standard/tests/file/rename_variation2-win32.php b/hphp/test/zend/bad/ext/standard/tests/file/rename_variation2-win32.php
index c215b5bdf70..401e02891f5 100644
--- a/hphp/test/zend/bad/ext/standard/tests/file/rename_variation2-win32.php
+++ b/hphp/test/zend/bad/ext/standard/tests/file/rename_variation2-win32.php
@@ -6,27 +6,27 @@
 require dirname(__FILE__).'/file.inc';
 
 $file_path = dirname(__FILE__);
-mkdir("$file_path/rename_variation_dir");
+mkdir("$file_path/rename_variation2_dir");
 
 /* Renaming a file and directory to numeric name */
 echo "\n*** Testing rename() by renaming a file and directory to numeric name ***\n";
-$fp = fopen($file_path."/rename_variation.tmp", "w");
+$fp = fopen($file_path."/rename_variation2.tmp", "w");
 fclose($fp);
 
 // renaming existing file to numeric name
-var_dump( rename($file_path."/rename_variation.tmp", $file_path."/12345") );
+var_dump( rename($file_path."/rename_variation2.tmp", $file_path."/12345") );
 
 // ensure that rename worked fine
-var_dump( file_exists($file_path."/rename_variation.tmp" ) );  // expecting false
+var_dump( file_exists($file_path."/rename_variation2.tmp" ) );  // expecting false
 var_dump( file_exists($file_path."/12345" ) );  // expecting true
 
 unlink($file_path."/12345");
 
 // renaming a directory to numeric name
-var_dump( rename($file_path."/rename_variation_dir/", $file_path."/12345") );
+var_dump( rename($file_path."/rename_variation2_dir/", $file_path."/12345") );
 
 // ensure that rename worked fine
-var_dump( file_exists($file_path."/rename_variation_dir" ) );  // expecting false
+var_dump( file_exists($file_path."/rename_variation2_dir" ) );  // expecting false
 var_dump( file_exists($file_path."/12345" ) );  // expecting true
 
 rmdir($file_path."/12345");
@@ -34,7 +34,7 @@ rmdir($file_path."/12345");
 echo "Done\n";
 ?><?php
 $file_path = dirname(__FILE__);
-unlink($file_path."/rename_variation_link.tmp");
-unlink($file_path."/rename_variation.tmp");
-rmdir($file_path."/rename_variation_dir");
+unlink($file_path."/rename_variation2_link.tmp");
+unlink($file_path."/rename_variation2.tmp");
+rmdir($file_path."/rename_variation2_dir");
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext/standard/tests/file/rename_variation2.php b/hphp/test/zend/bad/ext/standard/tests/file/rename_variation2.php
index 13d6e2fd460..39c96bcae33 100644
--- a/hphp/test/zend/bad/ext/standard/tests/file/rename_variation2.php
+++ b/hphp/test/zend/bad/ext/standard/tests/file/rename_variation2.php
@@ -2,7 +2,7 @@
 
 $file_path = dirname(__FILE__);
 
-$dest_dir = "$file_path/rename_variation_dir";
+$dest_dir = "$file_path/rename_variation2_dir";
 // create the $dest_dir
 mkdir($dest_dir);
 
@@ -14,11 +14,11 @@ $filename = $file_path."/rename_variation2.tmp";
 var_dump(touch($filename));
 
 // create the soft links to the file
-$linkname = $file_path."/rename_variation_soft_link1.tmp";
+$linkname = $file_path."/rename_variation2_soft_link1.tmp";
 var_dump(symlink($filename, $linkname));
 
 //rename the link to a new name in the same dir
-$dest_linkname = $file_path."/rename_variation_soft_link2.tmp";
+$dest_linkname = $file_path."/rename_variation2_soft_link2.tmp";
 var_dump( rename( $linkname, $dest_linkname) );
 //ensure that link was renamed 
 clearstatcache();
@@ -26,18 +26,18 @@ var_dump( file_exists($linkname) );  // expecting false
 var_dump( file_exists($dest_linkname) );  // expecting true
 
 // rename a link across dir
-var_dump( rename($dest_linkname, $dest_dir."/rename_variation_soft_link2.tmp"));
+var_dump( rename($dest_linkname, $dest_dir."/rename_variation2_soft_link2.tmp"));
 //ensure that link got renamed
 clearstatcache();
 var_dump( file_exists($dest_linkname) );  // expecting false
-var_dump( file_exists($dest_dir."/rename_variation_soft_link2.tmp") ); // expecting true
+var_dump( file_exists($dest_dir."/rename_variation2_soft_link2.tmp") ); // expecting true
 
 // delete the link file now 
-unlink($dest_dir."/rename_variation_soft_link2.tmp");
+unlink($dest_dir."/rename_variation2_soft_link2.tmp");
 
 echo "Done\n";
 ?><?php
 $file_path = dirname(__FILE__);
 unlink($file_path."/rename_variation2.tmp");
-rmdir($file_path."/rename_variation_dir");
+rmdir($file_path."/rename_variation2_dir");
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext/standard/tests/file/rename_variation3.php b/hphp/test/zend/bad/ext/standard/tests/file/rename_variation3.php
index dff9e1c41d1..99e8d662637 100644
--- a/hphp/test/zend/bad/ext/standard/tests/file/rename_variation3.php
+++ b/hphp/test/zend/bad/ext/standard/tests/file/rename_variation3.php
@@ -2,37 +2,37 @@
 
 $file_path = dirname(__FILE__);
 
-$dest_dir = "$file_path/rename_variation_dir";
+$dest_dir = "$file_path/rename_variation3_dir";
 // create the $dest_dir
 mkdir($dest_dir);
 
 echo "\n*** Testing rename() on hard links ***\n";
-$filename = $file_path."/rename_variation1.tmp";
+$filename = $file_path."/rename_variation31.tmp";
 @unlink($filename);
 var_dump(touch($filename));
 
-$linkname = $file_path."/rename_variation_hard_link1.tmp";
+$linkname = $file_path."/rename_variation3_hard_link1.tmp";
 var_dump(link($filename, $linkname));
 
 //rename the link to a new name in the same dir
-$dest_linkname = $file_path."/rename_variation_hard_link2.tmp";
+$dest_linkname = $file_path."/rename_variation3_hard_link2.tmp";
 var_dump( rename( $filename, $dest_linkname) );
 //ensure that link was renamed
 var_dump( file_exists($filename) );  // expecting false
 var_dump( file_exists($dest_linkname) );  // expecting true
 
 // rename a hard link across dir
-var_dump( rename($dest_linkname, $dest_dir."/rename_variation_hard_link2.tmp") );
+var_dump( rename($dest_linkname, $dest_dir."/rename_variation3_hard_link2.tmp") );
 //ensure that link got renamed
 var_dump( file_exists($dest_linkname) );  // expecting false
-var_dump( file_exists($dest_dir."/rename_variation_hard_link2.tmp") ); // expecting true
+var_dump( file_exists($dest_dir."/rename_variation3_hard_link2.tmp") ); // expecting true
 
 // delete the link file now
-unlink($dest_dir."/rename_variation_hard_link2.tmp");
+unlink($dest_dir."/rename_variation3_hard_link2.tmp");
 
 echo "Done\n";
 ?><?php
 $file_path = dirname(__FILE__);
-unlink($file_path."/rename_variation_hard_link1.tmp");
-rmdir($file_path."/rename_variation_dir");
+unlink($file_path."/rename_variation3_hard_link1.tmp");
+rmdir($file_path."/rename_variation3_dir");
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext/standard/tests/file/rename_variation4.php b/hphp/test/zend/bad/ext/standard/tests/file/rename_variation4.php
index b4f0b0125b1..df8a58ca5f4 100644
--- a/hphp/test/zend/bad/ext/standard/tests/file/rename_variation4.php
+++ b/hphp/test/zend/bad/ext/standard/tests/file/rename_variation4.php
@@ -6,22 +6,22 @@ require dirname(__FILE__).'/file.inc';
 
 /* Renaming a file, link and directory to numeric name */
 echo "\n*** Testing rename() by renaming a file, link and directory to numeric name ***\n";
-$fp = fopen($file_path."/rename_variation.tmp", "w");
+$fp = fopen($file_path."/rename_variation4.tmp", "w");
 fclose($fp);
 // renaming existing file to numeric name
-var_dump( rename($file_path."/rename_variation.tmp", $file_path."/12345") );
+var_dump( rename($file_path."/rename_variation4.tmp", $file_path."/12345") );
 // ensure that rename worked fine
-var_dump( file_exists($file_path."/rename_variation.tmp" ) );  // expecting false
+var_dump( file_exists($file_path."/rename_variation4.tmp" ) );  // expecting false
 var_dump( file_exists($file_path."/12345" ) );  // expecting true
 // remove the file
 unlink($file_path."/12345");
 
-mkdir($file_path."/rename_variation_dir");
+mkdir($file_path."/rename_variation4_dir");
 
 // renaming a directory to numeric name
-var_dump( rename($file_path."/rename_variation_dir/", $file_path."/12345") );
+var_dump( rename($file_path."/rename_variation4_dir/", $file_path."/12345") );
 // ensure that rename worked fine
-var_dump( file_exists($file_path."/rename_variation_dir" ) );  // expecting false
+var_dump( file_exists($file_path."/rename_variation4_dir" ) );  // expecting false
 var_dump( file_exists($file_path."/12345" ) );  // expecting true
 
 echo "Done\n";
diff --git a/hphp/test/zend/bad/ext/standard/tests/file/rename_variation5.php b/hphp/test/zend/bad/ext/standard/tests/file/rename_variation5.php
index d16825bede8..fe7c81f9165 100644
--- a/hphp/test/zend/bad/ext/standard/tests/file/rename_variation5.php
+++ b/hphp/test/zend/bad/ext/standard/tests/file/rename_variation5.php
@@ -4,14 +4,14 @@
   and one another */
 // create a dir 
 $file_path = dirname(__FILE__);
-$dirname = "$file_path/rename_variation_dir"; 
+$dirname = "$file_path/rename_variation5_dir";
 mkdir($dirname);
 //create a file
-$filename = "$file_path/rename_variation.tmp"; 
+$filename = "$file_path/rename_variation5.tmp";
 $fp = fopen($filename, "w");
 fclose($fp);
 // create a link
-$linkname = "$file_path/rename_variation_link.tmp";
+$linkname = "$file_path/rename_variation5_link.tmp";
 symlink($filename, $linkname);
 
 echo "\n-- Renaming link to same link name --\n";
@@ -43,7 +43,7 @@ var_dump( rename($dirname, $linkname) );
 echo "Done\n";
 ?><?php
 $file_path = dirname(__FILE__);
-unlink($file_path."/rename_variation_link.tmp");
-unlink($file_path."/rename_variation.tmp");
-rmdir($file_path."/rename_variation_dir");
+unlink($file_path."/rename_variation5_link.tmp");
+unlink($file_path."/rename_variation5.tmp");
+rmdir($file_path."/rename_variation5_dir");
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext/standard/tests/streams/stream_get_meta_data_socket_basic.php b/hphp/test/zend/bad/ext/standard/tests/streams/stream_get_meta_data_socket_basic.php
index 5a42e31dcba..e54db1f9863 100644
--- a/hphp/test/zend/bad/ext/standard/tests/streams/stream_get_meta_data_socket_basic.php
+++ b/hphp/test/zend/bad/ext/standard/tests/streams/stream_get_meta_data_socket_basic.php
@@ -1,6 +1,6 @@
 <?php
 
-$tcp_socket = stream_socket_server('tcp://127.0.0.1:31337');
+$tcp_socket = stream_socket_server('tcp://127.0.0.1:31330');
 var_dump(stream_get_meta_data($tcp_socket));
 fclose($tcp_socket);
 
diff --git a/hphp/test/zend/bad/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.php b/hphp/test/zend/bad/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.php
index fc11c64bf25..5cadeca24e2 100644
--- a/hphp/test/zend/bad/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.php
+++ b/hphp/test/zend/bad/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.php
@@ -1,10 +1,10 @@
 <?php
 
 /* Setup socket server */
-$server = stream_socket_server('tcp://127.0.0.1:31337');
+$server = stream_socket_server('tcp://127.0.0.1:31331');
 
 /* Connect to it */
-$client = fsockopen('tcp://127.0.0.1:31337');
+$client = fsockopen('tcp://127.0.0.1:31331');
 if (!$client) {
 	die("Unable to create socket");
 }
diff --git a/hphp/test/zend/bad/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.php b/hphp/test/zend/bad/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.php
index bc927b1fd74..052b54e2742 100644
--- a/hphp/test/zend/bad/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.php
+++ b/hphp/test/zend/bad/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.php
@@ -1,10 +1,10 @@
 <?php
 
 /* Setup socket server */
-$server = stream_socket_server('tcp://127.0.0.1:31337');
+$server = stream_socket_server('tcp://127.0.0.1:31332');
 
 /* Connect to it */
-$client = fsockopen('tcp://127.0.0.1:31337');
+$client = fsockopen('tcp://127.0.0.1:31332');
 if (!$client) {
 	die("Unable to create socket");
 }
diff --git a/hphp/test/zend/bad/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.php b/hphp/test/zend/bad/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.php
index 97098ac2d49..64729a82d3c 100644
--- a/hphp/test/zend/bad/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.php
+++ b/hphp/test/zend/bad/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.php
@@ -1,10 +1,10 @@
 <?php
 
 /* Setup socket server */
-$server = stream_socket_server('tcp://127.0.0.1:31337');
+$server = stream_socket_server('tcp://127.0.0.1:31333');
 
 /* Connect to it */
-$client = fsockopen('tcp://127.0.0.1:31337');
+$client = fsockopen('tcp://127.0.0.1:31333');
 if (!$client) {
 	die("Unable to create socket");
 }
diff --git a/hphp/test/zend/bad/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.php b/hphp/test/zend/bad/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.php
index 922467ed46c..64508b9e13d 100644
--- a/hphp/test/zend/bad/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.php
+++ b/hphp/test/zend/bad/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.php
@@ -1,10 +1,10 @@
 <?php
 
 /* Setup socket server */
-$server = stream_socket_server('tcp://127.0.0.1:31337');
+$server = stream_socket_server('tcp://127.0.0.1:31334');
 
 /* Connect to it */
-$client = fsockopen('tcp://127.0.0.1:31337');
+$client = fsockopen('tcp://127.0.0.1:31334');
 if (!$client) {
 	die("Unable to create socket");
 }
diff --git a/hphp/test/zend/good/ext/standard/tests/file/fopen_include_path.inc b/hphp/test/zend/good/ext/standard/tests/file/fopen_include_path.inc
index 7d6723a8150..5bc9b6ce3b2 100644
--- a/hphp/test/zend/good/ext/standard/tests/file/fopen_include_path.inc
+++ b/hphp/test/zend/good/ext/standard/tests/file/fopen_include_path.inc
@@ -1,6 +1,6 @@
 <?php
 $pwd = getcwd();
-$f = basename(__FILE__);
+$f = basename(current(get_included_files()), ".php");
 $dir1 = $pwd."/".$f.".dir1";
 $dir2 = $pwd."/".$f.".dir2";
 $dir3 = $pwd."/".$f.".dir3";
diff --git a/hphp/test/zend/good/ext/standard/tests/file/fopen_variation16.php b/hphp/test/zend/good/ext/standard/tests/file/fopen_variation16.php
index 2298bf0958e..ee7ee3909ac 100644
--- a/hphp/test/zend/good/ext/standard/tests/file/fopen_variation16.php
+++ b/hphp/test/zend/good/ext/standard/tests/file/fopen_variation16.php
@@ -27,7 +27,7 @@ rmdir($thisTestDir);
 function runtest() {
     global $dir1;
        
-    $extraDir = "extraDir";
+    $extraDir = "extraDir16";
 
     mkdir($dir1.'/'.$extraDir);
     mkdir($extraDir);
diff --git a/hphp/test/zend/good/ext/standard/tests/file/fopen_variation17.php b/hphp/test/zend/good/ext/standard/tests/file/fopen_variation17.php
index e40e11474ad..387c1e7db64 100644
--- a/hphp/test/zend/good/ext/standard/tests/file/fopen_variation17.php
+++ b/hphp/test/zend/good/ext/standard/tests/file/fopen_variation17.php
@@ -27,7 +27,7 @@ rmdir($thisTestDir);
 function runtest() {
     global $dir1;
        
-    $extraDir = "extraDir";
+    $extraDir = "extraDir17";
 
     mkdir($dir1.'/'.$extraDir);
     mkdir($extraDir);
diff --git a/hphp/tools/import_zend_test.py b/hphp/tools/import_zend_test.py
index a62ea44600b..dd3cc48d96b 100755
--- a/hphp/tools/import_zend_test.py
+++ b/hphp/tools/import_zend_test.py
@@ -274,6 +274,11 @@ norepo_tests = (
     '/ext/standard/tests/class_object/get_declared_traits_variation1.php',
     '/ext/standard/tests/class_object/interface_exists_variation3.php',
     '/ext/standard/tests/class_object/interface_exists_variation4.php',
+    '/ext/standard/tests/file/file_get_contents_basic.php',
+    '/ext/standard/tests/file/file_get_contents_file_put_contents_basic.php',
+    '/ext/standard/tests/file/file_get_contents_file_put_contents_variation1.php',
+    '/ext/standard/tests/file/file_get_contents_file_put_contents_variation2.php',
+    '/ext/standard/tests/file/file_get_contents_variation1.php',
     '/ext/standard/tests/general_functions/is_numeric.php',
     '/ext/standard/tests/math/abs.php',
     '/ext/standard/tests/math/pow.php',
@@ -468,7 +473,7 @@ parser.add_argument(
     "--zend_path",
     type=str,
     required=True,
-    help="zend path to import tests from. git checkout https://github.com/php/php-src"
+    help="zend path to import tests from. git clone https://github.com/php/php-src"
 )
 parser.add_argument(
     "-o",
-- 
2.11.4.GIT