minor #19777 [Yaml] Fix test scanning the full tmp directory (nicolas-grekas)

fabpot · fabpot · commit 9b39c7a091b6 · 2016-08-29T09:55:43.000-07:00
This PR was merged into the 3.2-dev branch. Discussion ---------- [Yaml] Fix test scanning the full tmp directory | Q | A | ------------- | --- | Branch? | master | Tests pass? | yes | Fixed tickets | - | License | MIT Commits ------- d2d4b3c [Yaml] Fix test scanning the full tmp directory
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/YamlLintCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/YamlLintCommandTest.php
@@ -115,7 +115,7 @@ public function testLintFilesFromBundleDirectory()
      */
     private function createFile($content)
     {
-        $filename = tempnam(sys_get_temp_dir(), 'sf-');
+        $filename = tempnam(sys_get_temp_dir().'/yml-lint-test', 'sf-');
         file_put_contents($filename, $content);
 
         $this->files[] = $filename;
@@ -152,7 +152,7 @@ private function getKernelAwareApplicationMock()
             ->expects($this->once())
             ->method('locateResource')
             ->with('@AppBundle/Resources')
-            ->willReturn(sys_get_temp_dir());
+            ->willReturn(sys_get_temp_dir().'/yml-lint-test');
 
         $application = $this->getMockBuilder(Application::class)
             ->disableOriginalConstructor()
@@ -184,6 +184,7 @@ private function getKernelAwareApplicationMock()
 
     protected function setUp()
     {
+        @mkdir(sys_get_temp_dir().'/yml-lint-test');
         $this->files = array();
     }
 
@@ -194,5 +195,6 @@ protected function tearDown()
                 unlink($file);
             }
         }
+        rmdir(sys_get_temp_dir().'/yml-lint-test');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public function testLintFilesFromBundleDirectory()`
`115`	`115`	`*/`
`116`	`116`	`private function createFile($content)`
`117`	`117`	`{`
`118`		`- $filename = tempnam(sys_get_temp_dir(), 'sf-');`
	`118`	`+ $filename = tempnam(sys_get_temp_dir().'/yml-lint-test', 'sf-');`
`119`	`119`	`file_put_contents($filename, $content);`
`120`	`120`
`121`	`121`	`$this->files[] = $filename;`
`@@ -152,7 +152,7 @@ private function getKernelAwareApplicationMock()`
`152`	`152`	`->expects($this->once())`
`153`	`153`	`->method('locateResource')`
`154`	`154`	`->with('@AppBundle/Resources')`
`155`		`- ->willReturn(sys_get_temp_dir());`
	`155`	`+ ->willReturn(sys_get_temp_dir().'/yml-lint-test');`
`156`	`156`
`157`	`157`	`$application = $this->getMockBuilder(Application::class)`
`158`	`158`	`->disableOriginalConstructor()`
`@@ -184,6 +184,7 @@ private function getKernelAwareApplicationMock()`
`184`	`184`
`185`	`185`	`protected function setUp()`
`186`	`186`	`{`
	`187`	`+ @mkdir(sys_get_temp_dir().'/yml-lint-test');`
`187`	`188`	`$this->files = array();`
`188`	`189`	`}`
`189`	`190`
`@@ -194,5 +195,6 @@ protected function tearDown()`
`194`	`195`	`unlink($file);`
`195`	`196`	`}`
`196`	`197`	`}`
	`198`	`+ rmdir(sys_get_temp_dir().'/yml-lint-test');`
`197`	`199`	`}`
`198`	`200`	`}`