cloud-init-dev team mailing list archive

[Chad Smith <chad.smith@xxxxxxxxxxxxx>]

Diff comments:

> diff --git a/tests/cloud_tests/testcases/base.py b/tests/cloud_tests/testcases/base.py
> index 0d1916b..da93ab2 100644
> --- a/tests/cloud_tests/testcases/base.py
> +++ b/tests/cloud_tests/testcases/base.py
> @@ -31,6 +31,27 @@ class CloudTestCase(unittest.TestCase):
>      def is_distro(self, distro_name):
>          return self.os_cfg['os'] == distro_name
>  
> +    def assertPackageInstalled(self, name, version=None):
> +        """Check dpkg-query --show output for matching package name.
> +
> +        @param name: package base name
> +        @param version: string representing a package version or part of a
> +            version.
> +        """ 
> +        pkg_out = self.get_data_file('package-versions')
> +        pkg_match = re.match(
> +            '.*\n%s\t(?P<version>[^\n]+)' % name, pkg_out, re.DOTALL)

good thought, fixed.

> +        if pkg_match:
> +            installed_version = pkg_match.group('version')
> +            if not version:
> +                return  # Success
> +            if version in installed_version:

No current users, but I've switched to using installed_version.startswith(version) now.

> +                return  # Success
> +            raise AssertionError(
> +                'Expected package version %s-%s not found. Found %s' %
> +                name, version, installed_version)   
> +        raise AssertionError('Package not installed: %s' % name)   
> +
>      def os_version_cmp(self, cmp_version):
>          """Compare the version of the test to comparison_version.
>  


-- 
https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/345256
Your team cloud-init commiters is requested to review the proposed merge of ~chad.smith/cloud-init:bug/cloud-tests-pkg-install into cloud-init:master.