Merge lp:~psivaa/ubuntu-test-cases/mod_php-fix into lp:ubuntu-test-cases/server

[Para Siva]

[Robie Basak (racb)]

lgtm. I know that Apache in Debian (and now Trusty) has this changed path. Thanks!

review: Approve

[lp:~psivaa/ubuntu-test-cases/mod_php-fix]

95. By Para Siva on 2014-02-24

Following mysql-5.5 changes

96. By Para Siva on 2014-02-24

localhost is now only available for root

[Para Siva (psivaa)]

I've made some changes to the mysql tests after the changes for mysql-5.5 on 5.5.35+dfsg-1ubuntu1. Could you please verify these changes as well. Thanks

[Robie Basak (racb)]

This is certainly no worse than it was before. Please also change the comment from 7 to 5 - otherwise the comment will mismatch the code.

A suggest for improvement here (but I don't wish for this to block merging this branch now): I'd say that we should check the return value of the mysql command, since that is the conventional programmatic way for it to declare that there was a problem. subprocess.Popen provides a mechanism to do this.

review: Approve

=== modified file 'testsuites/lamp/test_mod_php/test.py'
--- testsuites/lamp/test_mod_php/test.py	2013-07-19 15:01:29 +0000
+++ testsuites/lamp/test_mod_php/test.py	2014-02-24 21:31:21 +0000
@@ -29,7 +29,7 @@
 
 class LampTest(unittest.TestCase):
     def testModPhp(self):
-        php_fh = open("/var/www/test.php", "w")
+        php_fh = open("/var/www/html/test.php", "w")
         php_fh.write("<?php $world=\"Hello World!\"; echo $world; ?>")
         php_fh.close()
 
 
=== modified file 'testsuites/lamp/test_mysql_select_from_users/test.py'
--- testsuites/lamp/test_mysql_select_from_users/test.py	2013-03-01 17:39:50 +0000
+++ testsuites/lamp/test_mysql_select_from_users/test.py	2014-02-24 21:31:21 +0000
@@ -39,7 +39,7 @@
 
         logging.debug("Cmd output: %s" % (output))
         logging.debug("Check if there are 7 records")
-        self.assertEqual(len(output.strip().split("\n")), 7)
+        self.assertEqual(len(output.strip().split("\n")), 5)
 
 if __name__ == '__main__':
     unittest.main()
 
=== modified file 'testsuites/lamp/test_mysql_show_databases/test.py'
--- testsuites/lamp/test_mysql_show_databases/test.py	2013-03-01 17:39:50 +0000
+++ testsuites/lamp/test_mysql_show_databases/test.py	2014-02-24 21:31:21 +0000
@@ -37,8 +37,8 @@
         self.assertEqual(stderr, None)
         logging.debug("Cmd output: %s" % (output))
         self.assertEqual(output.strip().split("\n"),
-                         ["information_schema", "mysql", "performance_schema",
-                          "test"])
+                         ["information_schema", "mysql",
+                          "performance_schema"])
 
 if __name__ == '__main__':
     unittest.main()