merge from trunk

6 files changed, 32 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index f11f2c73..ae7957b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
  - fix 'make test' in python 2.6
  - support jinja2 as a templating engine.  Drop the hard requirement on
    cheetah.  This helps in python3 effort. (LP: #1219223)
+ - change install path for systemd files to /lib/systemd/system
+   [Dimitri John Ledkov]
 0.7.5:
  - open 0.7.5
  - Add a debug log message around import failures
diff --git a/packages/bddeb b/packages/bddeb
index e731d23f..9d264f92 100755
--- a/packages/bddeb
+++ b/packages/bddeb
@@ -39,7 +39,7 @@ PKG_MP = {
     'pyyaml': 'python-yaml',
     'requests': 'python-requests',
 }
-DEBUILD_ARGS = ["-us", "-S", "-uc", "-d"]
+DEBUILD_ARGS = ["-S", "-d"]
 
 
 def write_debian_folder(root, version, revno, append_requires=[]):
@@ -105,10 +105,17 @@ def main():
 
     for ent in DEBUILD_ARGS:
         parser.add_argument(ent, dest="debuild_args", action='append_const',
-            const=ent, help=("pass through '%s' to debuild" % ent))
+            const=ent, help=("pass through '%s' to debuild" % ent),
+            default=[])
+
+    parser.add_argument("--sign", default=False, action='store_true',
+                        help="sign result. do not pass -us -uc to debuild")
 
     args = parser.parse_args()
 
+    if not args.sign:
+        args.debuild_args.extend(['-us', '-uc'])
+
     os.environ['INIT_SYSTEM'] = args.init_system
 
     capture = True
@@ -168,7 +175,8 @@ def main():
         print("Copied that archive to %r for local usage (if desired)." %
               (util.abs_join(os.getcwd(), tar_fn)))
 
-        print("Running 'debuild' in %r" % (xdir))
+        print("Running 'debuild %s' in %r" % (' '.join(args.debuild_args),
+                                              xdir))
         with util.chdir(xdir):
             cmd = ['debuild', '--preserve-envvar', 'INIT_SYSTEM']
             if args.debuild_args:
diff --git a/tests/unittests/helpers.py b/tests/unittests/helpers.py
index 970eb8cb..9700a4ca 100644
--- a/tests/unittests/helpers.py
+++ b/tests/unittests/helpers.py
@@ -233,6 +233,21 @@ class FilesystemMockingTestCase(ResourceUsingTestCase):
                 self.patched_funcs.append((mod, f, func))
 
 
+class HttprettyTestCase(TestCase):
+    # necessary as http_proxy gets in the way of httpretty
+    # https://github.com/gabrielfalcao/HTTPretty/issues/122
+    def setUp(self):
+        self.restore_proxy = os.environ.get('http_proxy')
+        if self.restore_proxy is not None:
+            del os.environ['http_proxy']
+        super(HttprettyTestCase, self).setUp()
+
+    def tearDown(self):
+        if self.restore_proxy:
+            os.environ['http_proxy'] = self.restore_proxy
+        super(HttprettyTestCase, self).tearDown()
+
+
 def populate_dir(path, files):
     if not os.path.exists(path):
         os.makedirs(path)
diff --git a/tests/unittests/test_datasource/test_gce.py b/tests/unittests/test_datasource/test_gce.py
index 405dfbdb..60a0ce48 100644
--- a/tests/unittests/test_datasource/test_gce.py
+++ b/tests/unittests/test_datasource/test_gce.py
@@ -55,12 +55,13 @@ def _request_callback(method, uri, headers):
         return (404, headers, '')
 
 
-class TestDataSourceGCE(test_helpers.TestCase):
+class TestDataSourceGCE(test_helpers.HttprettyTestCase):
 
     def setUp(self):
         self.ds = DataSourceGCE.DataSourceGCE(
             settings.CFG_BUILTIN, None,
             helpers.Paths({}))
+        super(TestDataSourceGCE, self).setUp()
 
     @httpretty.activate
     def test_connection(self):
diff --git a/tests/unittests/test_datasource/test_openstack.py b/tests/unittests/test_datasource/test_openstack.py
index c5298aaa..c088bb55 100644
--- a/tests/unittests/test_datasource/test_openstack.py
+++ b/tests/unittests/test_datasource/test_openstack.py
@@ -121,7 +121,7 @@ def _register_uris(version, ec2_files, ec2_meta, os_files):
                     body=get_request_callback)
 
 
-class TestOpenStackDataSource(test_helpers.TestCase):
+class TestOpenStackDataSource(test_helpers.HttprettyTestCase):
     VERSION = 'latest'
 
     @hp.activate
diff --git a/tests/unittests/test_ec2_util.py b/tests/unittests/test_ec2_util.py
index 26cd12ec..700254a3 100644
--- a/tests/unittests/test_ec2_util.py
+++ b/tests/unittests/test_ec2_util.py
@@ -6,7 +6,7 @@ from cloudinit import url_helper as uh
 import httpretty as hp
 
 
-class TestEc2Util(helpers.TestCase):
+class TestEc2Util(helpers.HttprettyTestCase):
     VERSION = 'latest'
 
     @hp.activate