0
@@ -187,19 +187,9 @@ private:
0
     bool result;
0
     if (stat(restartFile.c_str(), &buf) == 0) {
0
       int ret;
0
-			#ifdef TESTING_APPLICATION_POOL
0
-				if (getenv("nextRestartTxtDeletionShouldFail") != NULL) {
0
-					unsetenv("nextRestartTxtDeletionShouldFail");
0
-					ret = -1;
0
-					errno = EACCES;
0
-				} else {
0
-					ret = unlink(restartFile.c_str());
0
-				}
0
-			#else
0
-				do {
0
-					ret = unlink(restartFile.c_str());
0
-				} while (ret == -1 && errno == EAGAIN);
0
-			#endif
0
+			do {
0
+				ret = unlink(restartFile.c_str());
0
+			} while (ret == -1 && errno == EAGAIN);
0
       if (ret == 0 || errno == ENOENT) {
0
         restartFileTimes.erase(appRoot);
0
         result = true;

0
@@ -271,17 +271,20 @@
0
     session1.reset();
0
     session2.reset();
0
     
0
-		setenv("nextRestartTxtDeletionShouldFail", "1", 1);
0
-		system("touch stub/railsapp/tmp/restart.txt");
0
+		system("mkdir -p stub/railsapp/tmp/restart.txt");
0
     
0
     old_pid = pool->get("stub/railsapp")->getPid();
0
-		ensure("Restart file has not been deleted",
0
-			stat("stub/railsapp/tmp/restart.txt", &buf) == 0);
0
+		try {
0
+			ensure("Restart file has not been deleted",
0
+				stat("stub/railsapp/tmp/restart.txt", &buf) == 0);
0
+			system("rmdir stub/railsapp/tmp/restart.txt");
0
+		} catch (...) {
0
+			system("rmdir stub/railsapp/tmp/restart.txt");
0
+			throw;
0
+		}
0
     
0
-		setenv("nextRestartTxtDeletionShouldFail", "1", 1);
0
     pid = pool->get("stub/railsapp")->getPid();
0
     ensure_equals("The app was not restarted", pid, old_pid);
0
-		
0
     unlink("stub/railsapp/tmp/restart.txt");
0
   }
0