Re: [Cloud-init-dev] [Merge] ~chad.smith/cloud-init:tests/cii-summary-fallback-to-traceback into cloud-init:master
Review: Approve continuous-integration PASSED: Continuous integration, rev:f14a6d926eb8fc5ee39831ebc63cf034dc723ea0 https://jenkins.ubuntu.com/server/job/cloud-init-ci/507/ Executed test runs: SUCCESS: Checkout SUCCESS: Unit & Style Tests SUCCESS: Ubuntu LTS: Build SUCCESS: Ubuntu LTS: Integration IN_PROGRESS: Declarative: Post Actions Click here to trigger a rebuild: https://jenkins.ubuntu.com/server/job/cloud-init-ci/507/rebuild -- https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/356427 Your team cloud-init commiters is requested to review the proposed merge of ~chad.smith/cloud-init:tests/cii-summary-fallback-to-traceback into cloud-init:master. ___ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
Re: [Cloud-init-dev] [Merge] ~chad.smith/cloud-init:tests/cii-summary-fallback-to-traceback into cloud-init:master
@Chad. the first commit is in. So rebase on mater, and push for c-i. can you give an example of the end result of this chagne? -- https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/356427 Your team cloud-init commiters is requested to review the proposed merge of ~chad.smith/cloud-init:tests/cii-summary-fallback-to-traceback into cloud-init:master. ___ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
Re: [Cloud-init-dev] [Merge] ~chad.smith/cloud-init:tests/cii-summary-fallback-to-traceback into cloud-init:master
Review: Approve continuous-integration PASSED: Continuous integration, rev:f9d86009ec65a42cb8c61aae02f79f3cd8b5363a https://jenkins.ubuntu.com/server/job/cloud-init-ci/391/ Executed test runs: SUCCESS: Checkout SUCCESS: Unit & Style Tests SUCCESS: Ubuntu LTS: Build SUCCESS: Ubuntu LTS: Integration IN_PROGRESS: Declarative: Post Actions Click here to trigger a rebuild: https://jenkins.ubuntu.com/server/job/cloud-init-ci/391/rebuild -- https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/356427 Your team cloud-init commiters is requested to review the proposed merge of ~chad.smith/cloud-init:tests/cii-summary-fallback-to-traceback into cloud-init:master. ___ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
[Cloud-init-dev] [Merge] ~chad.smith/cloud-init:tests/cii-summary-fallback-to-traceback into cloud-init:master
The proposal to merge ~chad.smith/cloud-init:tests/cii-summary-fallback-to-traceback into cloud-init:master has been updated. Commit message changed to: tests: integration test failure summary to use traceback if empty error When integration tests verification fails, the object returned contains has 'error' and 'traceback' keys. Each key can contain empty strings. If the simplified 'error' message is empty, fallback and use the more verbose full 'traceback' text in the failure summary. For more details, see: https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/356427 -- Your team cloud-init commiters is requested to review the proposed merge of ~chad.smith/cloud-init:tests/cii-summary-fallback-to-traceback into cloud-init:master. ___ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
Re: [Cloud-init-dev] [Merge] ~chad.smith/cloud-init:tests/cii-summary-fallback-to-traceback into cloud-init:master
Will hold on committing this until cosmic freeze is over. Basically it changes the following output test failures: * tests.cloud_tests.testcases.modules.apt_configure_sources_key.TestAptconfigureSourcesKey.test_instance_data_json_kvm - CHANGED TO- test failures: * tests.cloud_tests.testcases.modules.apt_configure_sources_key.TestAptconfigureSourcesKey.test_instance_data_json_kvm Traceback (most recent call last): File "/var/lib/jenkins/slaves/torkoal/workspace/cloud-init-integration-nocloud-kvm-c/cloud-init/tests/cloud_tests/testcases/base.py", line 265, in test_instance_data_json_kvm self.assertEqual('config-disk (/dev/vda)', v1_data['subplatform']) AssertionError: 'config-disk (/dev/vda)' != 'config-disk (/dev/vdb)' - config-disk (/dev/vda) ? ^ + config-disk (/dev/vdb) ? -- https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/356427 Your team cloud-init commiters is requested to review the proposed merge of ~chad.smith/cloud-init:tests/cii-summary-fallback-to-traceback into cloud-init:master. ___ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
[Cloud-init-dev] [Merge] ~chad.smith/cloud-init:tests/cii-summary-fallback-to-traceback into cloud-init:master
Chad Smith has proposed merging ~chad.smith/cloud-init:tests/cii-summary-fallback-to-traceback into cloud-init:master. Commit message: tests: integration test failure summary to use traceback if empty error When integration tests verification fails the failure object returned contains has 'error' and 'traceback' keys each which can contain empty strings. If the simplified 'error' message is empty, fallback and use the more verbose full 'traceback' text in the failure summary. Requested reviews: cloud-init commiters (cloud-init-dev) Related bugs: Bug #1797199 in cloud-init: "kvm integration test failures due to invalid config-disk path" https://bugs.launchpad.net/cloud-init/+bug/1797199 For more details, see: https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/356427 -- Your team cloud-init commiters is requested to review the proposed merge of ~chad.smith/cloud-init:tests/cii-summary-fallback-to-traceback into cloud-init:master. diff --git a/tests/cloud_tests/testcases/base.py b/tests/cloud_tests/testcases/base.py index 16b268e..bbd80ae 100644 --- a/tests/cloud_tests/testcases/base.py +++ b/tests/cloud_tests/testcases/base.py @@ -262,7 +262,10 @@ class CloudTestCase(unittest2.TestCase): self.assertItemsEqual([], instance_data['base64_encoded_keys']) self.assertEqual('unknown', v1_data['cloud_name']) self.assertEqual('nocloud', v1_data['platform']) -self.assertEqual('config-disk (/dev/vda)', v1_data['subplatform']) +subplatform = v1_data['subplatform'] +self.assertIsNotNone( +re.match(r'config-disk \(\/dev\/[a-z]{3}\)', subplatform), +'kvm subplatform "%s" != "config-disk (/dev/...)"' % subplatform) self.assertIsNone( v1_data['availability_zone'], 'found unexpected kvm availability_zone %s' % diff --git a/tests/cloud_tests/verify.py b/tests/cloud_tests/verify.py index 9911ecf..7018f4d 100644 --- a/tests/cloud_tests/verify.py +++ b/tests/cloud_tests/verify.py @@ -61,12 +61,17 @@ def format_test_failures(test_result): if not test_result['failures']: return '' failure_hdr = 'test failures:' -failure_fmt = '* {module}.{class}.{function}\n {error}' +failure_fmt = '* {module}.{class}.{function}\n ' output = [] for failure in test_result['failures']: if not output: output = [failure_hdr] -output.append(failure_fmt.format(**failure)) +msg = failure_fmt.format(**failure) +if failure.get('error'): +msg += failure['error'] +else: +msg += failure.get('traceback', '') +output.append(msg) return '\n'.join(output) ___ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp