James Page has proposed merging lp:~james-page/ubuntu-server-iso-testing/reboot-testing-fixes into lp:ubuntu-server-iso-testing.
Requested reviews: Ubuntu Server Iso Testing Developers (ubuntu-server-iso-testing-dev) For more details, see: https://code.launchpad.net/~james-page/ubuntu-server-iso-testing/reboot-testing-fixes/+merge/97362 These updates fix reboot testing to actually work; two issues are resolved. 1) The same test case was being injected for the post reboot tests 2) The results for pre-reboot testing where being collect for post reboot which was incorrect. I've tested locally with the server test templates for lamp-reboot and lamp. -- https://code.launchpad.net/~james-page/ubuntu-server-iso-testing/reboot-testing-fixes/+merge/97362 Your team Ubuntu Server Iso Testing Developers is requested to review the proposed merge of lp:~james-page/ubuntu-server-iso-testing/reboot-testing-fixes into lp:ubuntu-server-iso-testing.
=== modified file 'debian/copyright' --- debian/copyright 2010-12-01 17:48:05 +0000 +++ debian/copyright 2012-03-14 10:14:18 +0000 @@ -1,81 +1,40 @@ -This work was packaged for Debian by: - - James Page <[email protected]> on Wed, 01 Dec 2010 08:29:07 +0000 - -Upstream Author(s): - - James Page <[email protected]> - Mathias Gug <[email protected]> - -Copyright: - - Copyright (C) 2010 Canonical Ltd (http://www.canonical.com) - -License: - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - -On Debian systems, the complete text of the GNU General -Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". - - -File: hudson.py - -Downloaded from: - - https://code.ros.org/svn/ros/stacks/ros_release/trunk/hudson/src/hudson.py - -Upstream Author(s): - - Ken Conoly (http://kwc.org) - -Copyright: - - Copyright (c) 2010, Willow Garage, Inc. - All rights reserved. - -License: - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of Willow Garage, Inc. nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -The Debian packaging is: - - Copyright (C) 2010 Canonical Ltd (http://www.canonical.com) - -and is licensed under the GPL version 3, see above. +Format: http://dep.debian.net/deps/dep5/ +Upstream-Name: Ubuntu ISO Testing +Source: http://launchpad.net/ubuntu-server-iso-testing + +Files: * +Copyright: 2010 Canonical Ltd (http://www.canonical.com) +License: GPL-3 + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in + "/usr/share/common-licenses/GPL-3". + +Files: hudson.py +Copyright: 2010, Willow Garage, Inc. +License: BSD 3-Clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of Willow Garage, Inc. nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. === modified file 'run-test.py' --- run-test.py 2012-03-01 13:23:20 +0000 +++ run-test.py 2012-03-14 10:14:18 +0000 @@ -439,7 +439,8 @@ if os.path.exists(post_reboot_test): logging.debug("Adding post-reboot tests") test_case_doc = db[test_uuid] - db.put_attachment(test_case_doc, open(t_script), + logging.debug("Test script: %s" % (post_reboot_test)) + db.put_attachment(test_case_doc, open(post_reboot_test), filename="post-reboot-tests/%s" % (t_preseed)) # Allow tests to override the default disk size @@ -704,10 +705,10 @@ # execute and wrote to CouchDB # Retrieve log output an place in hudson workspace logging.debug("Tests completed for test case %s" % test['_id']) - # Iterate over all test results as tests completed OK test_results = test['results'] for test_result in test_results: + logging.debug("Storing results for test %s", test_result) test_results_file = os.path.join(testresultsdir, "%s.stderr" % test_result) f = open (test_results_file, 'w') f.write(test['results'][test_result]['script_stderr']) @@ -715,25 +716,24 @@ test_results_file = os.path.join(testresultsdir, "TEST-%s.xml" % test_result) f = open (test_results_file, 'w') f.write(test['results'][test_result]['script_stdout']) - f.close() - + f.close() test_completed = True else: logging.debug("VM for test case %s powered off but tests not completed" % test['_id']) if test['states'].has_key('rebooted'): logging.debug("Test case %s rebooted." % test['_id']) - post_reboot_results = test['post-reboot-results'] for test_result in post_reboot_results: + logging.debug("Storing results for test %s", test_result) test_results_file = os.path.join(testresultsdir, "post-reboot-%s.stderr" % test_result) f = open (test_results_file, 'w') - f.write(test['results'][test_result]['script_stderr']) + f.write(test['post-reboot-results'][test_result]['script_stderr']) f.close() test_results_file = os.path.join(testresultsdir, "TEST-POST-REBOOT-%s.xml" % test_result) f = open (test_results_file, 'w') - f.write(test['results'][test_result]['script_stdout']) - f.close() + f.write(test['post-reboot-results'][test_result]['script_stdout']) + f.close() # save D-I logs no matter what (if they exist, of course) if os.path.isfile(syslog_path):
_______________________________________________ Mailing list: https://launchpad.net/~ubuntu-server-iso-testing-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~ubuntu-server-iso-testing-dev More help : https://help.launchpad.net/ListHelp
