Merge lp:~stevanr/linaro-license-protection/phpunit-wrong-fail-message into lp:~linaro-automation/linaro-license-protection/trunk

[Stevan Radaković]

Fix php unit wrong error message when tests are failing - #1005452

[lp:~stevanr/linaro-license-protection/phpunit-wrong-fail-message]

78. By Stevan Radaković on 2012-05-29

Fix php unit wrong error message when tests are failing.

[Georgy Redkozubov (gesha)]

Looks good

review: Approve

=== modified file 'tests/LicenseHelperTest.php'
--- tests/LicenseHelperTest.php	2012-05-11 14:02:26 +0000
+++ tests/LicenseHelperTest.php	2012-05-29 07:40:23 +0000
@@ -6,6 +6,18 @@
 {
 
     private $temp_filename;
+    private $temp_link;
+
+    public function setUp() {
+        $this->temp_link = sys_get_temp_dir() . "/temp_link";
+    }
+
+    public function tearDown() {
+        if (file_exists($this->temp_link)) {
+            unlink($this->temp_link);
+        }
+    }
+
 
     /**
      * Running checkFile on a directory path returns false.
@@ -21,11 +33,10 @@
     public function test_checkFile_link()
     {
         $this->temp_filename = tempnam(sys_get_temp_dir(), "unittest");
-        symlink($this->temp_filename, "test_link");
-
-        $this->assertTrue(LicenseHelper::checkFile("test_link"));
-
-        unlink("test_link");
+        symlink($this->temp_filename, $this->temp_link);
+
+        $this->assertTrue(LicenseHelper::checkFile($this->temp_link));
+
         unlink($this->temp_filename);
     }
 
@@ -36,12 +47,11 @@
     public function test_checkFile_brokenLink()
     {
         $this->temp_filename = tempnam(sys_get_temp_dir(), "unittest");
-        symlink($this->temp_filename, "test_link");
+        symlink($this->temp_filename, $this->temp_link);
+
+        $this->assertTrue(LicenseHelper::checkFile($this->temp_link));
+
         unlink($this->temp_filename);
-
-        $this->assertTrue(LicenseHelper::checkFile("test_link"));
-
-        unlink("test_link");
     }
 
     /**

=== modified file 'tests/test_php_unit.py'
--- tests/test_php_unit.py	2012-05-17 18:44:59 +0000
+++ tests/test_php_unit.py	2012-05-29 07:40:23 +0000
@@ -16,10 +16,11 @@
     def setUp(self):
         super(PhpUnitTest, self).setUp()
         self.xml_path = tempfile.mkstemp()[1]
-        if subprocess.Popen(['phpunit', '--log-junit',
-                             self.xml_path, 'tests/LicenseHelperTest'],
-                stdout=open('/dev/null', 'w'),
-                stderr=subprocess.STDOUT).wait():
+        returncode = subprocess.Popen(['phpunit', '--log-junit',
+                          self.xml_path, 'tests/LicenseHelperTest'],
+                          stdout=open('/dev/null', 'w'),
+                          stderr=subprocess.STDOUT).wait()
+        if returncode == -1:
             raise CommandNotFoundException("phpunit command not found. Please "
                 "install phpunit package and rerun tests.")
         self.xml_data = xml.etree.ElementTree.parse(self.xml_path)