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

Proposed by Parameswaran Sivatharman on 2014-01-31
Status: Merged
Merged at revision: 96
Proposed branch: lp:~psivaa/ubuntu-test-cases/mod_php-fix
Merge into: lp:ubuntu-test-cases/server
Diff against target: 40 lines (+4/-4) 3 files modified
To merge this branch: bzr merge lp:~psivaa/ubuntu-test-cases/mod_php-fix
Reviewer Review Type Date Requested Status
Robie Basak 2014-01-31 Approve on 2014-02-25
Review via email: mp+204273@code.launchpad.net
To post a comment you must log in.
Robie Basak (racb) wrote :

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

review: Approve
95. By Parameswaran Sivatharman on 2014-02-24

Following mysql-5.5 changes

96. By Parameswaran Sivatharman on 2014-02-24

localhost is now only available for root

Parameswaran Sivatharman (psivaa) wrote :

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) wrote :

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

Preview Diff

1=== modified file 'testsuites/lamp/test_mod_php/test.py'
2--- testsuites/lamp/test_mod_php/test.py 2013-07-19 15:01:29 +0000
3+++ testsuites/lamp/test_mod_php/test.py 2014-02-24 21:31:21 +0000
4@@ -29,7 +29,7 @@
5
6 class LampTest(unittest.TestCase):
7 def testModPhp(self):
8- php_fh = open("/var/www/test.php", "w")
9+ php_fh = open("/var/www/html/test.php", "w")
10 php_fh.write("<?php $world=\"Hello World!\"; echo $world; ?>")
11 php_fh.close()
12
13
14=== modified file 'testsuites/lamp/test_mysql_select_from_users/test.py'
15--- testsuites/lamp/test_mysql_select_from_users/test.py 2013-03-01 17:39:50 +0000
16+++ testsuites/lamp/test_mysql_select_from_users/test.py 2014-02-24 21:31:21 +0000
17@@ -39,7 +39,7 @@
18
19 logging.debug("Cmd output: %s" % (output))
20 logging.debug("Check if there are 7 records")
21- self.assertEqual(len(output.strip().split("\n")), 7)
22+ self.assertEqual(len(output.strip().split("\n")), 5)
23
24 if __name__ == '__main__':
25 unittest.main()
26
27=== modified file 'testsuites/lamp/test_mysql_show_databases/test.py'
28--- testsuites/lamp/test_mysql_show_databases/test.py 2013-03-01 17:39:50 +0000
29+++ testsuites/lamp/test_mysql_show_databases/test.py 2014-02-24 21:31:21 +0000
30@@ -37,8 +37,8 @@
31 self.assertEqual(stderr, None)
32 logging.debug("Cmd output: %s" % (output))
33 self.assertEqual(output.strip().split("\n"),
34- ["information_schema", "mysql", "performance_schema",
35- "test"])
36+ ["information_schema", "mysql",
37+ "performance_schema"])
38
39 if __name__ == '__main__':
40 unittest.main()

Subscribers

People subscribed via source and target branches