minor #13225 [Filesystem] enforce umask while testing (nicolas-grekas)

fabpot · fabpot · commit 7d15c1d9db4b · 2015-01-03T22:01:25.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [Filesystem] enforce umask while testing | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Having a predictable umask (but not the usual one) should help (TDD for #13222). When merging in 2.5, the patch should be moved to the new `FilesystemTestCase` Commits ------- 1e547be [Filesystem] enforce umask while testing
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -18,6 +18,8 @@
  */
 class FilesystemTest extends \PHPUnit_Framework_TestCase
 {
+    private $umask;
+
     /**
      * @var string
      */
@@ -47,6 +49,7 @@ public static function setUpBeforeClass()
 
     public function setUp()
     {
+        $this->umask = umask(0);
         $this->filesystem = new Filesystem();
         $this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().rand(0, 1000);
         mkdir($this->workspace, 0777, true);
@@ -56,6 +59,7 @@ public function setUp()
     public function tearDown()
     {
         $this->clean($this->workspace);
+        umask($this->umask);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@`
`18`	`18`	`*/`
`19`	`19`	`class FilesystemTest extends \PHPUnit_Framework_TestCase`
`20`	`20`	`{`
	`21`	`+ private $umask;`
	`22`	`+`
`21`	`23`	`/**`
`22`	`24`	`* @var string`
`23`	`25`	`*/`
`@@ -47,6 +49,7 @@ public static function setUpBeforeClass()`
`47`	`49`
`48`	`50`	`public function setUp()`
`49`	`51`	`{`
	`52`	`+ $this->umask = umask(0);`
`50`	`53`	`$this->filesystem = new Filesystem();`
`51`	`54`	`$this->workspace = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.time().rand(0, 1000);`
`52`	`55`	`mkdir($this->workspace, 0777, true);`
`@@ -56,6 +59,7 @@ public function setUp()`
`56`	`59`	`public function tearDown()`
`57`	`60`	`{`
`58`	`61`	`$this->clean($this->workspace);`
	`62`	`+ umask($this->umask);`
`59`	`63`	`}`
`60`	`64`
`61`	`65`	`/**`