Merge lp:~wgrant/juju-deployer/test-fixes into lp:juju-deployer

[William Grant]

Two fixes to make running tests easier.

Two fixes to make running tests easier: isolate the testrunner's bzr and git configs (preventing eg. clobbering of whoami, or failures due to create_signatures=always), and declare the test dependency on mock.

[Tim Van Steenburgh (tvansteenburgh)]

LGTM, thanks!

review: Approve

=== modified file 'deployer/tests/test_charm.py'
--- deployer/tests/test_charm.py	2016-10-24 16:49:55 +0000
+++ deployer/tests/test_charm.py	2016-11-04 00:24:53 +0000
@@ -92,6 +92,11 @@
 class BzrCharmTest(Base):
 
     def setUp(self):
+        # Isolate tests from the user's bzr config.
+        orig_home = os.environ.get('HOME')
+        os.environ['HOME'] = self.mkdir()
+        self.addCleanup(os.environ.update, {'HOME': orig_home})
+
         self.repo_path = d = self.mkdir()
         self.series_path = os.path.join(d, "precise")
         os.mkdir(self.series_path)
@@ -237,6 +242,11 @@
 class GitCharmTest(Base):
 
     def setUp(self):
+        # Isolate tests from the user's git config.
+        orig_home = os.environ.get('HOME')
+        os.environ['HOME'] = self.mkdir()
+        self.addCleanup(os.environ.update, {'HOME': orig_home})
+
         self.repo_path = d = self.mkdir()
         self.series_path = os.path.join(d, "precise")
         os.mkdir(self.series_path)
 
=== modified file 'setup.py'
--- setup.py	2016-10-25 15:56:18 +0000
+++ setup.py	2016-11-04 00:24:53 +0000
@@ -11,6 +11,7 @@
     author_email="[e-mail]",
     url="http://launchpad.net/juju-deployer",
     install_requires=["jujuclient>=0.53", "PyYAML>=3.10", "six"],
+    extras_require={"test": ["mock"]},
     packages=find_packages(),
     classifiers=[
         "Development Status :: 4 - Beta",