cloud-init-dev team mailing list archive

[Dan Watkins <daniel.watkins@xxxxxxxxxxxxx>]

Review: Needs Information



Diff comments:

> diff --git a/tests/unittests/test_datasource/test_gce.py b/tests/unittests/test_datasource/test_gce.py
> index a5cced0..8757cb8 100644
> --- a/tests/unittests/test_datasource/test_gce.py
> +++ b/tests/unittests/test_datasource/test_gce.py
> @@ -14,8 +14,8 @@ from cloudinit import settings
>  from cloudinit.sources import DataSourceGCE
>  
>  from .. import helpers as test_helpers
> +from ..helpers import httpretty

Could this line just become `import httpretty`?

>  
> -httpretty = test_helpers.import_httpretty()
>  
>  GCE_META = {
>      'instance/id': '123',
> diff --git a/tests/unittests/test_datasource/test_openstack.py b/tests/unittests/test_datasource/test_openstack.py
> index 28e1833..6eeed73 100644
> --- a/tests/unittests/test_datasource/test_openstack.py
> +++ b/tests/unittests/test_datasource/test_openstack.py
> @@ -20,7 +20,7 @@ from cloudinit.sources import DataSourceOpenStack as ds
>  from cloudinit.sources.helpers import openstack
>  from cloudinit import util
>  
> -hp = test_helpers.import_httpretty()
> +hp = helpers.httpretty

Ditto.

>  
>  BASE_URL = "http://169.254.169.254";
>  PUBKEY = u'ssh-rsa AAAAB3NzaC1....sIkJhq8wdX+4I3A4cYbYP ubuntu@server-460\n'
> diff --git a/tests/unittests/test_ec2_util.py b/tests/unittests/test_ec2_util.py
> index 71c2009..61723d9 100644
> --- a/tests/unittests/test_ec2_util.py
> +++ b/tests/unittests/test_ec2_util.py
> @@ -5,7 +5,7 @@ from . import helpers
>  from cloudinit import ec2_utils as eu
>  from cloudinit import url_helper as uh
>  
> -hp = helpers.import_httpretty()
> +hp = helpers.httpretty

Ditto.

>  
>  
>  class TestEc2Util(helpers.HttprettyTestCase):


-- 
https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/315489
Your team cloud init development team is requested to review the proposed merge of ~smoser/cloud-init:httpretty-cleanup into cloud-init:master.