summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorDaniel Watkins <oddbloke@ubuntu.com>2020-06-30 13:17:40 -0400
committerGitHub <noreply@github.com>2020-06-30 11:17:40 -0600
commit66e114a660c53400e389f119781f378311b65108 (patch)
tree7d0c3ca519f0e245288a9fb9d51a899d8f67cea0 /packages
parentbaf11418c196ca72e6d570b64051d8ed35065abb (diff)
downloadvyos-cloud-init-66e114a660c53400e389f119781f378311b65108.tar.gz
vyos-cloud-init-66e114a660c53400e389f119781f378311b65108.zip
Enable use of the caplog fixture in pytest tests, and add a cc_final_message test using it (#461)
caplog is only available in pytest itself from 3.0 onwards. In xenial, we only have pytest 2.8.7. However, in xenial we do have pytest-catchlog available (as python3-pytest-catchlog), so we use that where appropriate.
Diffstat (limited to 'packages')
-rwxr-xr-xpackages/bddeb2
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/bddeb b/packages/bddeb
index 78b1c83b..b0f219b6 100755
--- a/packages/bddeb
+++ b/packages/bddeb
@@ -91,6 +91,8 @@ def write_debian_folder(root, templ_data, cloud_util_deps):
# NOTE: python package was moved to the front after debuild -S would fail with
# 'Please add apropriate interpreter' errors (as in debian bug 861132)
requires.extend(['python3'] + reqs + test_reqs)
+ if templ_data['debian_release'] == 'xenial':
+ requires.append('python3-pytest-catchlog')
templater.render_to_file(util.abs_join(find_root(),
'packages', 'debian', 'control.in'),
util.abs_join(deb_dir, 'control'),