curtin-dev team mailing list archive

[Ryan Harper <ryan.harper@xxxxxxxxxxxxx>]

Review: Needs Information

Thanks, one more question on the vmtests; it's not clear to me why we've got network-disabled tests in test_network.py rather than both of those classes in test_network_disabled.py and have the two different config versions subclass from your main TestNetMetaDisabled abstract class?

Diff comments:

> diff --git a/tests/vmtests/test_network.py b/tests/vmtests/test_network.py
> index 7d2e779..c49262a 100644
> --- a/tests/vmtests/test_network.py
> +++ b/tests/vmtests/test_network.py
> @@ -491,4 +491,34 @@ class Centos70TestNetworkBasic(centos_relbase.centos70_xenial,
>                                 CentosTestNetworkBasicAbs):
>      __test__ = True
>  
> +
> +class FocalTestNetworkDisabledConfigWithVersion(relbase.focal,
> +                                                TestNetworkBasicAbs):
> +    """ Basic network test but with network config marked as disabled
> +    with a version key
> +    """
> +    conf_file = "examples/tests/network_config_disabled_with_version.yaml"
> +    __test__ = True
> +
> +    def test_etc_resolvconf(self):
> +        raise SkipTest('not available on %s' % self.__class__)
> +
> +    def test_ip_output(self):
> +        raise SkipTest('not available on %s' % self.__class__)
> +
> +

Shouldn't both of these be in test_network_disabled?  And derived from TestNetMetaDisabledModeBasicTestsAbs?

> +class FocalTestNetworkDisabledConfig(relbase.focal, TestNetworkBasicAbs):
> +    """ Basic network test but with network config marked as disabled
> +    without a version key
> +    """
> +    conf_file = "examples/tests/network_config_disabled.yaml"
> +    __test__ = True
> +
> +    def test_etc_resolvconf(self):
> +        raise SkipTest('not available on %s' % self.__class__)
> +
> +    def test_ip_output(self):
> +        raise SkipTest('not available on %s' % self.__class__)
> +
> +
>  # vi: ts=4 expandtab syntax=python


-- 
https://code.launchpad.net/~lamoura/curtin/+git/curtin/+merge/383785
Your team curtin developers is subscribed to branch curtin:master.