Merge lp:~dobey/tarmac/fix-whoami into lp:tarmac

[dobey]

Use bzr's TestCaseInTempDir to avoid bzr whoami errors
Fix a couple more pep8 complaints

[lp:~dobey/tarmac/fix-whoami]

355. By dobey on 2010-09-13

Fix pyflakes/pep8 issues

[Gavin Panella (allenap)]

This works (for me) on Lucid with bzr 2.2 :)

I hope you don't mind, but I had one comment:

+ TestCaseInTempDir.setUp(self)

TestCaseInTempDir.setUp() uses super(), so I think it would be better
to use it here too. There are several other places where the super
classes are explicitly called and they should probably change too.

review: Approve

[lp:~dobey/tarmac/fix-whoami]

356. By dobey on 2010-09-14

Switch to using super for the testcase inheritence
Switch to using bzrlib's TestCaseInTempDir for all test cases
Cache and restore the old tempfile.tempdir value

357. By dobey on 2010-09-14

Fix pyflakes/pep8 issues

[Paul Hummer (rockstar)]

review: Approve

=== modified file 'tarmac/plugins/tests/test_bugresolver.py'
--- tarmac/plugins/tests/test_bugresolver.py	2010-09-09 16:28:47 +0000
+++ tarmac/plugins/tests/test_bugresolver.py	2010-09-14 16:58:40 +0000
@@ -19,6 +19,7 @@
 from tarmac.tests import TarmacTestCase
 from tarmac.tests.mock import Thing
 
+
 class BugResolverTests(TarmacTestCase):
     """Test the BugResolver."""
 
@@ -35,12 +36,12 @@
             pass
 
         bugs = {
-            '0' : Thing(
+            '0': Thing(
                 bug_tasks=[Thing(target='Target', status='In Progress',
                                  lp_save=lp_save),
                            Thing(target='Ubuntu', status='Incomplete',
                                  lp_save=lp_save)]),
-            '1' : Thing(
+            '1': Thing(
                 bug_tasks=[Thing(target='Target', status='Confirmed',
                                  lp_save=lp_save)]),
             }
 
=== modified file 'tarmac/plugins/tests/test_recipebuilder.py'
--- tarmac/plugins/tests/test_recipebuilder.py	2010-09-09 16:28:47 +0000
+++ tarmac/plugins/tests/test_recipebuilder.py	2010-09-14 16:58:40 +0000
@@ -19,6 +19,7 @@
 from tarmac.tests import TarmacTestCase
 from tarmac.tests.mock import Thing
 
+
 class RecipeBuilderTests(TarmacTestCase):
     """Test the Recipe Builder."""
 
 
=== modified file 'tarmac/tests/__init__.py'
--- tarmac/tests/__init__.py	2010-08-13 18:56:40 +0000
+++ tarmac/tests/__init__.py	2010-09-14 16:58:40 +0000
@@ -18,12 +18,12 @@
 import os
 import shutil
 import tempfile
-import unittest
 
+from bzrlib.tests import TestCaseInTempDir
 from tarmac.config import TarmacConfig
 
 
-class TarmacTestCase(unittest.TestCase):
+class TarmacTestCase(TestCaseInTempDir):
     '''A base TestCase for all Tarmac tests.'''
 
     CREDS_TEMPLATE = '''
@@ -36,6 +36,9 @@
 
     def setUp(self):
         # Set up the environment.
+        super(TarmacTestCase, self).setUp()
+
+        self._oldtemp = tempfile.tempdir
         tempfile.tempdir = os.getcwd()
         self.tempdir = tempfile.mkdtemp(dir=os.getcwd())
         os.environ['TARMAC_CONFIG_HOME'] = os.path.join(
@@ -61,6 +64,8 @@
                 del os.environ[key]
             except KeyError:
                 pass
+        tempfile.tempdir = self._oldtemp
+        super(TarmacTestCase, self).tearDown()
 
     def write_credentials_file(self):
         """Write out the temporary credentials file for testing."""
 
=== modified file 'tarmac/tests/test_branch.py'
--- tarmac/tests/test_branch.py	2010-09-02 15:18:07 +0000
+++ tarmac/tests/test_branch.py	2010-09-14 16:58:40 +0000
@@ -18,6 +18,7 @@
 
 '''Tests for tarmac.branch'''
 import os
+import shutil
 
 from bzrlib.errors import PointlessMerge
 
@@ -31,10 +32,7 @@
 
     def setUp(self):
         '''Set up the test environment.'''
-        TarmacTestCase.setUp(self)
-
-        self.bzrdir = os.path.join(os.getcwd(), "bzr")
-        os.environ['BZR_HOME'] = self.bzrdir
+        super(TestBranch, self).setUp()
 
         self.branch1, self.branch2 = self.make_two_branches_to_merge()
 
@@ -42,12 +40,15 @@
         """Tear down the tests."""
         self.remove_branch_config(self.branch1.lp_branch.tree_dir)
         self.remove_branch_config(self.branch2.lp_branch.tree_dir)
-        TarmacTestCase.tearDown(self)
+        shutil.rmtree(self.branch1.lp_branch.tree_dir)
+        shutil.rmtree(self.branch2.lp_branch.tree_dir)
+
+        super(TestBranch, self).tearDown()
 
     def make_two_branches_to_merge(self):
         '''Make two branches, one with revisions to merge.'''
-        branch1_dir = os.path.join(self.tempdir, 'branch1')
-        branch2_dir = os.path.join(self.tempdir, 'branch2')
+        branch1_dir = os.path.join(self.TEST_ROOT, 'branch1')
+        branch2_dir = os.path.join(self.TEST_ROOT, 'branch2')
         self.add_branch_config(branch1_dir)
         self.add_branch_config(branch2_dir)
 
@@ -72,7 +73,7 @@
 
     def test_create(self):
         '''Test the creation of a TarmacBranch instance.'''
-        tree_dir = os.path.join(self.tempdir, 'test_create')
+        tree_dir = os.path.join(self.TEST_ROOT, 'test_create')
         self.add_branch_config(tree_dir)
 
         a_branch = branch.Branch.create(MockLPBranch(tree_dir), self.config)
@@ -89,7 +90,7 @@
 
     def test_merge_raises_exception_with_no_tree(self):
         '''A merge on a branch with no tree will raise an exception.'''
-        branch3_dir = os.path.join(self.tempdir, 'branch3')
+        branch3_dir = os.path.join(self.TEST_ROOT, 'branch3')
         self.add_branch_config(branch3_dir)
         branch3 = branch.Branch.create(MockLPBranch(
                 branch3_dir, source_branch=self.branch1.lp_branch),
@@ -98,11 +99,12 @@
         self.assertRaises(
             AttributeError, branch3.merge, self.branch2)
         self.remove_branch_config(branch3_dir)
+        shutil.rmtree(branch3_dir)
 
     def test_merge_no_changes(self):
         '''A merge on a branch with a tree will raise an exception if no
         changes are present.'''
-        branch3_dir = os.path.join(self.tempdir, 'branch3')
+        branch3_dir = os.path.join(self.TEST_ROOT, 'branch3')
         self.add_branch_config(branch3_dir)
         branch3 = branch.Branch.create(MockLPBranch(
                 branch3_dir, source_branch=self.branch1.lp_branch),
@@ -110,6 +112,7 @@
 
         self.assertRaises(PointlessMerge, self.branch1.merge, branch3)
         self.remove_branch_config(branch3_dir)
+        shutil.rmtree(branch3_dir)
 
     def test_merge(self):
         '''A merge on a branch with a tree of a branch with changes will merge.