Merge lp://staging/~matsubara/ubuntu-test-cases/lamp-bug-1443987 into lp://staging/ubuntu-test-cases
Status: | Superseded |
---|---|
Proposed branch: | lp://staging/~matsubara/ubuntu-test-cases/lamp-bug-1443987 |
Merge into: | lp://staging/ubuntu-test-cases |
Diff against target: |
12130 lines (+10835/-0) (has conflicts) 233 files modified
README (+91/-0) TODO (+52/-0) preseeds/default.preseed (+333/-0) preseeds/dns-server.preseed (+333/-0) preseeds/generate-all (+10/-0) preseeds/generate_preseed.py (+64/-0) preseeds/lamp-reboot.preseed (+333/-0) preseeds/lamp.preseed (+333/-0) preseeds/lvm.preseed (+332/-0) preseeds/mail-server.preseed (+333/-0) preseeds/minimal-virtual.preseed (+333/-0) preseeds/multi-lvm.preseed (+333/-0) preseeds/openssh-server.preseed (+333/-0) preseeds/postgresql-server.preseed (+333/-0) preseeds/print-server.preseed (+333/-0) preseeds/raid1.preseed (+374/-0) preseeds/samba-server.preseed (+333/-0) preseeds/templates/base (+313/-0) preseeds/templates/default (+25/-0) preseeds/templates/dns-server (+27/-0) preseeds/templates/lamp (+27/-0) preseeds/templates/lamp-reboot (+24/-0) preseeds/templates/lvm (+28/-0) preseeds/templates/mail-server (+27/-0) preseeds/templates/minimal-virtual (+31/-0) preseeds/templates/multi-lvm (+28/-0) preseeds/templates/openssh-server (+27/-0) preseeds/templates/postgresql-server (+27/-0) preseeds/templates/print-server (+27/-0) preseeds/templates/raid1 (+73/-0) preseeds/templates/samba-server (+28/-0) preseeds/templates/tomcat-server (+28/-0) preseeds/templates/virtual-host (+28/-0) preseeds/tomcat-server.preseed (+333/-0) preseeds/virtual-host.preseed (+333/-0) runlists/ceph.run (+5/-0) runlists/default.run (+5/-0) runlists/dns-server.run (+5/-0) runlists/floodlight.run (+5/-0) runlists/lamp.run (+5/-0) runlists/lvm.run (+4/-0) runlists/lxc.run (+4/-0) runlists/mail-server.run (+4/-0) runlists/minimal-virtual.run (+5/-0) runlists/multi-lvm.run (+5/-0) runlists/openssh-server.run (+5/-0) runlists/postgresql-server.run (+5/-0) runlists/print-server.run (+5/-0) runlists/raid1.run (+5/-0) runlists/samba-server.run (+5/-0) runlists/tomcat-server.run (+4/-0) runlists/virtual-host.run (+5/-0) runtest (+8/-0) scripts/base.sh (+75/-0) scripts/ceph.sh (+4/-0) scripts/default.sh (+4/-0) scripts/raid1.sh (+4/-0) testsuites/ceph/tcleanup/cleanup.sh (+9/-0) testsuites/ceph/test_daemons/tc_control (+19/-0) testsuites/ceph/test_daemons/test.py (+70/-0) testsuites/ceph/test_rados/tc_control (+11/-0) testsuites/ceph/test_rados/test.py (+48/-0) testsuites/ceph/test_rbd/tc_control (+10/-0) testsuites/ceph/test_rbd/test.sh (+43/-0) testsuites/ceph/test_rest_bench/tc_control (+12/-0) testsuites/ceph/test_rest_bench/test.py (+52/-0) testsuites/ceph/ts_control (+3/-0) testsuites/ceph/tsetup/setup.sh (+104/-0) testsuites/ceph/tslist.run (+4/-0) testsuites/default/test_default/tc_control (+12/-0) testsuites/default/test_default/test.py (+58/-0) testsuites/default/ts_control (+1/-0) testsuites/default/tslist.run (+1/-0) testsuites/dns-server/test_bind_daemon/tc_control (+11/-0) testsuites/dns-server/test_bind_daemon/test.py (+38/-0) testsuites/dns-server/test_open_ports/tc_control (+15/-0) testsuites/dns-server/test_open_ports/test.py (+52/-0) testsuites/dns-server/test_resolve_tcp/tc_control (+11/-0) testsuites/dns-server/test_resolve_tcp/test.py (+42/-0) testsuites/dns-server/test_resolve_tcp6/tc_control (+11/-0) testsuites/dns-server/test_resolve_tcp6/test.py (+42/-0) testsuites/dns-server/test_resolve_udp/tc_control (+11/-0) testsuites/dns-server/test_resolve_udp/test.py (+42/-0) testsuites/dns-server/test_resolve_udp6/tc_control (+11/-0) testsuites/dns-server/test_resolve_udp6/test.py (+42/-0) testsuites/dns-server/ts_control (+1/-0) testsuites/dns-server/tslist.run (+6/-0) testsuites/floodlight/tcleanup/cleanup.sh (+6/-0) testsuites/floodlight/test_daemons/tc_control (+10/-0) testsuites/floodlight/test_daemons/test.py (+59/-0) testsuites/floodlight/test_openflow/tc_control (+12/-0) testsuites/floodlight/test_openflow/test.py (+61/-0) testsuites/floodlight/ts_control (+3/-0) testsuites/floodlight/tsetup/setup.sh (+11/-0) testsuites/floodlight/tslist.run (+2/-0) testsuites/lamp/test_apache/tc_control (+13/-0) testsuites/lamp/test_apache/test.py (+43/-0) testsuites/lamp/test_mod_php/tc_control (+13/-0) testsuites/lamp/test_mod_php/test.py (+49/-0) testsuites/lamp/test_mysql_select_from_users/tc_control (+14/-0) testsuites/lamp/test_mysql_select_from_users/test.py (+45/-0) testsuites/lamp/test_mysql_show_databases/tc_control (+12/-0) testsuites/lamp/test_mysql_show_databases/test.py (+44/-0) testsuites/lamp/test_mysql_show_tables/tc_control (+13/-0) testsuites/lamp/test_mysql_show_tables/test.py (+43/-0) testsuites/lamp/ts_control (+1/-0) testsuites/lamp/tslist.run (+5/-0) testsuites/lvm/test_lvs/tc_control (+12/-0) testsuites/lvm/test_lvs/test.py (+41/-0) testsuites/lvm/test_root_mount/tc_control (+10/-0) testsuites/lvm/test_root_mount/test.py (+41/-0) testsuites/lvm/test_vgs/tc_control (+12/-0) testsuites/lvm/test_vgs/test.py (+42/-0) testsuites/lvm/ts_control (+1/-0) testsuites/lvm/tslist.run (+6/-0) testsuites/lxc/tcleanup/cleanup.sh (+5/-0) testsuites/lxc/test_lxc_api/tc_control (+10/-0) testsuites/lxc/test_lxc_api/test.sh (+56/-0) testsuites/lxc/test_lxc_apparmor/lxctest.py (+219/-0) testsuites/lxc/test_lxc_apparmor/tc_control (+10/-0) testsuites/lxc/test_lxc_reboot/reboot-test.c (+116/-0) testsuites/lxc/test_lxc_reboot/tc_control (+10/-0) testsuites/lxc/test_lxc_reboot/test.sh (+28/-0) testsuites/lxc/test_lxc_simple/lxctest.py (+321/-0) testsuites/lxc/test_lxc_simple/tc_control (+10/-0) testsuites/lxc/test_lxc_simple/test.sh (+7/-0) testsuites/lxc/ts_control (+3/-0) testsuites/lxc/tsetup/setup.sh (+28/-0) testsuites/lxc/tslist.run (+5/-0) testsuites/mail-server/test_dovecot_tcp4/tc_control (+13/-0) testsuites/mail-server/test_dovecot_tcp4/test.py (+44/-0) testsuites/mail-server/test_dovecot_tcp6/tc_control (+13/-0) testsuites/mail-server/test_dovecot_tcp6/test.py (+45/-0) testsuites/mail-server/test_smtp_server/tc_control (+13/-0) testsuites/mail-server/test_smtp_server/test.py (+74/-0) testsuites/mail-server/ts_control (+1/-0) testsuites/mail-server/tslist.run (+6/-0) testsuites/minimal-virtual/test_install_size/tc_control (+10/-0) testsuites/minimal-virtual/test_install_size/test.py (+50/-0) testsuites/minimal-virtual/test_kernel_module_size/tc_control (+12/-0) testsuites/minimal-virtual/test_kernel_module_size/test.py (+45/-0) testsuites/minimal-virtual/test_linux_virtual/tc_control (+10/-0) testsuites/minimal-virtual/test_linux_virtual/test.py (+39/-0) testsuites/minimal-virtual/test_no_ubuntu_standard/tc_control (+10/-0) testsuites/minimal-virtual/test_no_ubuntu_standard/test.py (+41/-0) testsuites/minimal-virtual/test_read_write/tc_control (+14/-0) testsuites/minimal-virtual/test_read_write/test.py (+38/-0) testsuites/minimal-virtual/ts_control (+1/-0) testsuites/minimal-virtual/tslist.run (+10/-0) testsuites/multi-lvm/test_home_lv/tc_control (+12/-0) testsuites/multi-lvm/test_home_lv/test.py (+43/-0) testsuites/multi-lvm/test_lvs/tc_control (+12/-0) testsuites/multi-lvm/test_lvs/test.py (+43/-0) testsuites/multi-lvm/test_root_lv/tc_control (+12/-0) testsuites/multi-lvm/test_root_lv/test.py (+43/-0) testsuites/multi-lvm/test_root_mount/tc_control (+10/-0) testsuites/multi-lvm/test_root_mount/test.py (+41/-0) testsuites/multi-lvm/test_swap_lv/tc_control (+12/-0) testsuites/multi-lvm/test_swap_lv/test.py (+44/-0) testsuites/multi-lvm/test_tmp_lv/tc_control (+12/-0) testsuites/multi-lvm/test_tmp_lv/test.py (+43/-0) testsuites/multi-lvm/test_usr_lv/tc_control (+12/-0) testsuites/multi-lvm/test_usr_lv/test.py (+43/-0) testsuites/multi-lvm/test_var_lv/tc_control (+12/-0) testsuites/multi-lvm/test_var_lv/test.py (+43/-0) testsuites/multi-lvm/test_vgs/tc_control (+12/-0) testsuites/multi-lvm/test_vgs/test.py (+42/-0) testsuites/multi-lvm/ts_control (+1/-0) testsuites/multi-lvm/tslist.run (+18/-0) testsuites/openssh-server/test_open_ports/tc_control (+10/-0) testsuites/openssh-server/test_open_ports/test.py (+41/-0) testsuites/openssh-server/test_open_sshdeamon/tc_control (+10/-0) testsuites/openssh-server/test_open_sshdeamon/test.py (+39/-0) testsuites/openssh-server/test_ssh_access/tc_control (+14/-0) testsuites/openssh-server/test_ssh_access/test.py (+63/-0) testsuites/openssh-server/ts_control (+1/-0) testsuites/openssh-server/tslist.run (+4/-0) testsuites/postgresql-server/test_create_db/tc_control (+12/-0) testsuites/postgresql-server/test_create_db/test.py (+57/-0) testsuites/postgresql-server/test_postgre_sql_daemon/tc_control (+10/-0) testsuites/postgresql-server/test_postgre_sql_daemon/test.py (+51/-0) testsuites/postgresql-server/ts_control (+1/-0) testsuites/postgresql-server/tslist.run (+4/-0) testsuites/print-server/test_cups_daemon/tc_control (+10/-0) testsuites/print-server/test_cups_daemon/test.py (+39/-0) testsuites/print-server/ts_control (+1/-0) testsuites/print-server/tslist.run (+2/-0) testsuites/raid1/test_check_grub/tc_control (+10/-0) testsuites/raid1/test_check_grub/test.py (+53/-0) testsuites/raid1/test_degraded_boot/tc_control (+10/-0) testsuites/raid1/test_degraded_boot/test.py (+40/-0) testsuites/raid1/test_home_mount/tc_control (+10/-0) testsuites/raid1/test_home_mount/test.py (+42/-0) testsuites/raid1/test_raid_status/tc_control (+10/-0) testsuites/raid1/test_raid_status/test.py (+40/-0) testsuites/raid1/test_root_mount/tc_control (+10/-0) testsuites/raid1/test_root_mount/test.py (+42/-0) testsuites/raid1/test_swap_mount/tc_control (+10/-0) testsuites/raid1/test_swap_mount/test.py (+42/-0) testsuites/raid1/ts_control (+1/-0) testsuites/raid1/tslist.run (+12/-0) testsuites/samba-server/test_apport_hook/tc_control (+10/-0) testsuites/samba-server/test_apport_hook/test.py (+37/-0) testsuites/samba-server/test_default_workgroup/tc_control (+10/-0) testsuites/samba-server/test_default_workgroup/test.py (+39/-0) testsuites/samba-server/test_nmb_daemon/tc_control (+10/-0) testsuites/samba-server/test_nmb_daemon/test.py (+39/-0) testsuites/samba-server/test_smb_daemon/tc_control (+10/-0) testsuites/samba-server/test_smb_daemon/test.py (+39/-0) testsuites/samba-server/test_ufw_profile/tc_control (+10/-0) testsuites/samba-server/test_ufw_profile/test.py (+36/-0) testsuites/samba-server/test_wbinfo_minus_u/tc_control (+12/-0) testsuites/samba-server/test_wbinfo_minus_u/test.py (+46/-0) testsuites/samba-server/test_winbind_daemon/tc_control (+10/-0) testsuites/samba-server/test_winbind_daemon/test.py (+39/-0) testsuites/samba-server/ts_control (+1/-0) testsuites/samba-server/tslist.run (+14/-0) testsuites/tomcat-server/tcleanup/cleanup.sh (+6/-0) testsuites/tomcat-server/test_tomcat_daemon/tc_control (+10/-0) testsuites/tomcat-server/test_tomcat_daemon/test.py (+48/-0) testsuites/tomcat-server/test_tomcat_default_page/tc_control (+13/-0) testsuites/tomcat-server/test_tomcat_default_page/test.py (+45/-0) testsuites/tomcat-server/test_tomcat_jsp/tc_control (+12/-0) testsuites/tomcat-server/test_tomcat_jsp/test.py (+48/-0) testsuites/tomcat-server/test_tomcat_servlet/tc_control (+12/-0) testsuites/tomcat-server/test_tomcat_servlet/test.py (+48/-0) testsuites/tomcat-server/ts_control (+3/-0) testsuites/tomcat-server/tsetup/setup.sh (+8/-0) testsuites/tomcat-server/tslist.run (+8/-0) testsuites/virtual-host/test_ubuntu_virt_server/tc_control (+10/-0) testsuites/virtual-host/test_ubuntu_virt_server/test.py (+59/-0) testsuites/virtual-host/ts_control (+1/-0) testsuites/virtual-host/tslist.run (+2/-0) Conflict adding file scripts. Moved existing file to scripts.moved. |
To merge this branch: | bzr merge lp://staging/~matsubara/ubuntu-test-cases/lamp-bug-1443987 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Test Case Developers | Pending | ||
Review via email:
|
This proposal has been superseded by a proposal from 2015-04-15.
Commit message
Update lamp test case that checks the number of default mysql tables installed
Description of the change
Hi, this branch fixes the failing vivid smoke test for LAMP[1] by updating the number of default MySQL tables the test looks for. I have a question though, if I update this branch, will older releases such as trusty rely on this new test case? If yes, those are going to fail as well since on trusty the default mysql version installs only 24 tables, IIRC.
Should I special case the test case or does trusty use another branch for its test runs?
[1] http://
Unmerged revisions
- 102. By Diogo Matsubara
-
fix typo in set method.
- 101. By Diogo Matsubara
-
update LAMP tests to check for some expected tables in the MySQL database as well as checking for a minimum of 24 tables in it.
- 100. By Diogo Matsubara
-
fix lamp test case to match expected number of tables for newer version of MySQL
- 99. By James Page
-
Entropy generation as a workaround for bug 1269073
- 98. By James Page
-
Add some extra headroom for trusty
- 97. By Robie Basak
-
Update log output to match previous coding change
- 96. By Para Siva
-
localhost is now only available for root
- 95. By Para Siva
-
Following mysql-5.5 changes
- 94. By Para Siva
-
mod_php change to follow the upstream changes
- 93. By Serge Hallyn
-
lxc_test_api: rename lxc-$version directory to lxc