Merge lp:~jelmer/bzr-builddeb/deprecation-warnings into lp:bzr-builddeb

[Jelmer Vernooij]

Fix deprecation warnings for TestCase.failUnlessExists and TestCase.failIfExists in bzr 2.4.

[James Westby (james-w)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-09 12:13:13 +0000
+++ debian/changelog	2011-06-13 23:06:02 +0000
@@ -8,7 +8,11 @@
   * Use new set_commit_message() hook in bzr to set the commit
     message from debian/changelog and set fixed bugs in tags. LP: #707274
 
- -- Jonathan Riddell <[e-mail]>  Fri, 03 Jun 2011 15:36:10 +0100
+  [ Jelmer Vernooij ]
+  * Fix deprecation warnings for TestCase.failUnlessExists and
+    TestCase.failIfExists in bzr 2.4.
+
+ -- Jelmer Vernooij <[e-mail]>  Tue, 14 Jun 2011 00:02:40 +0100
 
 bzr-builddeb (2.7.4) unstable; urgency=low
 
 
=== modified file 'tests/__init__.py'
--- tests/__init__.py	2011-06-10 08:26:43 +0000
+++ tests/__init__.py	2011-06-13 23:06:02 +0000
@@ -28,13 +28,15 @@
 import os
 from unittest import TestSuite
 
+from bzrlib import tests
+
 try:
     from debian.changelog import Version, Changelog
 except ImportError:
     # Prior to 0.1.15 the debian module was called debian_bundle
     from debian_bundle.changelog import Version, Changelog
 
-from bzrlib.tests import TestUtil, multiply_tests, TestCaseWithTransport
+from bzrlib.tests import TestUtil, multiply_tests
 
 
 def make_new_upstream_dir(source, dest):
@@ -158,6 +160,28 @@
     return suite
 
 
+class TestCaseWithTransport(tests.TestCaseWithTransport):
+
+    if not getattr(tests.TestCaseWithTransport, "assertPathDoesNotExist", None):
+        # Compatibility with bzr < 2.4
+        def assertPathDoesNotExist(self, path):
+            self.failIfExists(path)
+
+        def assertPathExists(self, path):
+            self.failUnlessExists(path)
+
+
+class TestCaseInTempDir(tests.TestCaseInTempDir):
+
+    if not getattr(tests.TestCaseInTempDir, "assertPathDoesNotExist", None):
+        # Compatibility with bzr < 2.4
+        def assertPathDoesNotExist(self, path):
+            self.failIfExists(path)
+
+        def assertPathExists(self, path):
+            self.failUnlessExists(path)
+
+
 class BuilddebTestCase(TestCaseWithTransport):
 
     package_name = 'test'
 
=== modified file 'tests/blackbox/test_builddeb.py'
--- tests/blackbox/test_builddeb.py	2011-02-07 16:14:05 +0000
+++ tests/blackbox/test_builddeb.py	2011-06-13 23:06:02 +0000
@@ -50,14 +50,14 @@
     if isinstance(files, basestring):
       files = [files]
     for filename in files:
-      self.failUnlessExists(os.path.join(build_dir, filename))
+      self.assertPathExists(os.path.join(build_dir, filename))
 
   def assertNotInBuildDir(self, files):
     build_dir = self.build_dir()
     if isinstance(files, basestring):
       files = [files]
     for filename in files:
-      self.failIfExists(os.path.join(build_dir, filename))
+      self.assertPathDoesNotExist(os.path.join(build_dir, filename))
 
   def test_builddeb_registered(self):
     self.run_bzr("builddeb --help")
@@ -163,7 +163,7 @@
       f.close()
     self.run_bzr('add .bzr-builddeb/default.conf')
     self.run_bzr('bd --dont-purge --builder true')
-    self.failUnlessExists('pre-export')
+    self.assertPathExists('pre-export')
     self.assertInBuildDir(['pre-build', 'post-build'])
 
 # vim: ts=2 sts=2 sw=2
 
=== modified file 'tests/blackbox/test_do.py'
--- tests/blackbox/test_do.py	2011-03-01 12:17:42 +0000
+++ tests/blackbox/test_do.py	2011-06-13 23:06:02 +0000
@@ -44,6 +44,14 @@
   uncommited_file = 'uncommited_file'
   unadded_file = 'unadded_file'
 
+  if not getattr(ExternalBase, "assertPathDoesNotExist", None):
+    # Compatibility with bzr < 2.4
+    def assertPathDoesNotExist(self, path):
+      self.failIfExists(path)
+
+    def assertPathExists(self, path):
+      self.failUnlessExists(path)
+
   def make_changelog(self, version=None):
     if version is None:
       version = self.package_version
@@ -101,12 +109,12 @@
   def assertInBuildDir(self, files):
     build_dir = self.build_dir()
     for filename in files:
-      self.failUnlessExists(os.path.join(build_dir, filename))
+      self.assertPathExists(os.path.join(build_dir, filename))
 
   def assertNotInBuildDir(self, files):
     build_dir = self.build_dir()
     for filename in files:
-      self.failIfExists(os.path.join(build_dir, filename))
+      self.assertPathDoesNotExist(os.path.join(build_dir, filename))
 
   def test_bd_do_registered(self):
     self.run_bzr("bd-do --help")
@@ -127,14 +135,14 @@
     self.make_upstream_tarball()
     self.run_bzr_error(['Not updating the working tree as the command '
                         'failed.'], ['bd-do', 'touch debian/do && false'])
-    self.failIfExists('debian/do')
+    self.assertPathDoesNotExist('debian/do')
 
   def test_copy_on_success(self):
     tree = self.make_unpacked_source()
     self.make_merge_mode_config(tree)
     self.make_upstream_tarball()
     self.run_bzr(['bd-do', 'touch debian/do'])
-    self.failUnlessExists('debian/do')
+    self.assertPathExists('debian/do')
 
   def test_removed_files_are_removed_in_branch(self):
     tree = self.make_unpacked_source()
@@ -144,14 +152,14 @@
     # It might be nice if this was actually gone, but that would involve
     # either a comaparison, or removing all the files, but the latter is
     # dangerous. I guess it's a TODO to implement the comparison.
-    self.failUnlessExists('debian/changelog')
+    self.assertPathExists('debian/changelog')
 
   def test_new_directories_created(self):
     tree = self.make_unpacked_source()
     self.make_merge_mode_config(tree)
     self.make_upstream_tarball()
     self.run_bzr(['bd-do', 'mkdir debian/dir'])
-    self.failUnlessExists('debian/dir')
+    self.assertPathExists('debian/dir')
 
   def test_contents_taken_from_export(self):
     tree = self.make_unpacked_source()
@@ -165,7 +173,7 @@
     self.make_merge_mode_config(tree)
     self.make_upstream_tarball()
     self.run_bzr(['bd-do', 'echo a > debian/changelog'])
-    self.failIfExists(self.build_dir())
+    self.assertPathDoesNotExist(self.build_dir())
 
   def test_uses_shell(self):
     tree = self.make_unpacked_source()
@@ -180,6 +188,6 @@
         os.environ['SHELL'] = old_shell
       else:
         del os.environ['SHELL']
-    self.failUnlessExists('debian/shell')
+    self.assertPathExists('debian/shell')
 
 # vim: ts=2 sts=2 sw=2
 
=== modified file 'tests/blackbox/test_merge_upstream.py'
--- tests/blackbox/test_merge_upstream.py	2011-04-29 12:54:58 +0000
+++ tests/blackbox/test_merge_upstream.py	2011-06-13 23:06:02 +0000
@@ -196,7 +196,7 @@
         rel2 = self.release_upstream(changed_upstream)
         self.run_bzr(['merge-upstream', '--version', str(rel2.version),
             os.path.abspath(rel2.tarball)], working_dir=package.tree.basedir)
-        self.failUnlessExists(os.path.join(package.tree.basedir, 'muhook'))
+        self.assertPathExists(os.path.join(package.tree.basedir, 'muhook'))
 
     def test_new_package(self):
         upstream = self.make_upstream()
 
=== modified file 'tests/test_builder.py'
--- tests/test_builder.py	2009-02-20 17:55:08 +0000
+++ tests/test_builder.py	2011-06-13 23:06:02 +0000
@@ -32,27 +32,27 @@
     def test_prepare_makes_parents(self):
         builder = DebBuild(None, 'target/sub/sub2', None)
         builder.prepare()
-        self.failUnlessExists('target/sub')
-        self.failIfExists('target/sub/sub2')
+        self.assertPathExists('target/sub')
+        self.assertPathDoesNotExist('target/sub/sub2')
 
     def test_prepare_purges_dir(self):
         self.build_tree(['target/', 'target/sub/'])
         builder = DebBuild(None, 'target/sub/', None)
         builder.prepare()
-        self.failUnlessExists('target')
-        self.failIfExists('target/sub')
+        self.assertPathExists('target')
+        self.assertPathDoesNotExist('target/sub')
 
     def test_use_existing_preserves(self):
         self.build_tree(['target/', 'target/sub/'])
         builder = DebBuild(None, 'target/sub/', None, use_existing=True)
         builder.prepare()
-        self.failUnlessExists('target/sub')
+        self.assertPathExists('target/sub')
 
     def test_use_existing_errors_if_not_present(self):
         self.build_tree(['target/'])
         builder = DebBuild(None, 'target/sub/', None, use_existing=True)
         self.assertRaises(errors.NoSourceDirError, builder.prepare)
-        self.failIfExists('target/sub')
+        self.assertPathDoesNotExist('target/sub')
 
     def test_export(self):
         class MkdirDistiller(object):
@@ -60,13 +60,13 @@
                 os.mkdir(target)
         builder = DebBuild(MkdirDistiller(), 'target', None)
         builder.export()
-        self.failUnlessExists('target')
+        self.assertPathExists('target')
 
     def test_build(self):
         builder = DebBuild(None, 'target', "touch built")
         self.build_tree(['target/'])
         builder.build()
-        self.failUnlessExists('target/built')
+        self.assertPathExists('target/built')
 
     def test_build_fails(self):
         builder = DebBuild(None, 'target', "false")
@@ -77,4 +77,4 @@
         builder = DebBuild(None, 'target', None)
         self.build_tree(['target/', 'target/foo'])
         builder.clean()
-        self.failIfExists('target')
+        self.assertPathDoesNotExist('target')
 
=== modified file 'tests/test_bzrtools_import.py'
--- tests/test_bzrtools_import.py	2010-09-10 02:37:09 +0000
+++ tests/test_bzrtools_import.py	2011-06-13 23:06:02 +0000
@@ -18,9 +18,8 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-from bzrlib.tests import TestCaseWithTransport
-
 from bzrlib.plugins.builddeb.bzrtools_import import import_dir
+from bzrlib.plugins.builddeb.tests import TestCaseWithTransport
 
 
 class ImportArchiveTests(TestCaseWithTransport):
 
=== modified file 'tests/test_commit_message.py'
--- tests/test_commit_message.py	2011-06-03 14:39:17 +0000
+++ tests/test_commit_message.py	2011-06-13 23:06:02 +0000
@@ -17,9 +17,8 @@
 #    along with bzr-builddeb; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-from bzrlib.tests import TestCaseWithTransport
-
 from bzrlib.plugins.builddeb import debian_changelog_commit_message, debian_changelog_commit
+from bzrlib.plugins.builddeb.tests import TestCaseWithTransport
 
 
 class CommitMessageTests(TestCaseWithTransport):
 
=== modified file 'tests/test_config.py'
--- tests/test_config.py	2011-02-03 22:45:27 +0000
+++ tests/test_config.py	2011-06-13 23:06:02 +0000
@@ -19,13 +19,13 @@
 #
 
 from bzrlib.branch import Branch
-from bzrlib.tests import TestCaseWithTransport
 
 from bzrlib.plugins.builddeb.config import (
     BUILD_TYPE_MERGE,
     BUILD_TYPE_NORMAL,
     DebBuildConfig,
     )
+from bzrlib.plugins.builddeb.tests import TestCaseWithTransport
 
 
 class DebBuildConfigTests(TestCaseWithTransport):
 
=== modified file 'tests/test_dep3.py'
--- tests/test_dep3.py	2011-05-08 10:15:28 +0000
+++ tests/test_dep3.py	2011-06-13 23:06:02 +0000
@@ -27,7 +27,6 @@
     )
 from bzrlib.tests import (
     TestCase,
-    TestCaseWithTransport,
     )
 
 from bzrlib.plugins.builddeb.dep3 import (
@@ -39,6 +38,10 @@
     write_dep3_patch_header,
     )
 
+from bzrlib.plugins.builddeb.tests import (
+    TestCaseWithTransport,
+    )
+
 
 class Dep3HeaderTests(TestCase):
 
 
=== modified file 'tests/test_dh_make.py'
--- tests/test_dh_make.py	2010-02-09 20:06:07 +0000
+++ tests/test_dh_make.py	2011-06-13 23:06:02 +0000
@@ -9,12 +9,12 @@
     def test__get_tree_existing_branch(self):
         tree = self.make_branch_and_tree('.')
         new_tree = dh_make._get_tree("foo")
-        self.failIfExists("foo")
+        self.assertPathDoesNotExist("foo")
         self.assertEqual(tree.branch.base, new_tree.branch.base)
 
     def test__get_tree_no_existing_branch(self):
         new_tree = dh_make._get_tree("foo")
-        self.failUnlessExists("foo")
+        self.assertPathExists("foo")
 
     def test_import_upstream(self):
         tree = self.make_branch_and_tree('.')
@@ -34,10 +34,10 @@
                 tree.branch.last_revision())
         # Has the original revision as a parent
         self.assertEqual([revid], rev_tree.get_parent_ids())
-        self.failUnlessExists('a')
-        self.failUnlessExists('b')
+        self.assertPathExists('a')
+        self.assertPathExists('b')
         self.assertEqual(open('package-0.1/a').read(), open('a').read())
-        self.failUnlessExists('../package_0.1.orig.tar.gz')
+        self.assertPathExists('../package_0.1.orig.tar.gz')
 
     def test_import_upstream_no_existing(self):
         self.build_tree(['package-0.1/', 'package-0.1/a', 'package-0.1/b'])
@@ -47,12 +47,12 @@
         finally:
             tf.close()
         tree = dh_make.import_upstream('package-0.1', 'package', '0.1')
-        self.failUnlessExists("package")
+        self.assertPathExists("package")
         rev_tree = tree.branch.repository.revision_tree(
                 tree.branch.last_revision())
         # Has the original revision as a parent
-        self.failUnlessExists('package/a')
-        self.failUnlessExists('package/b')
+        self.assertPathExists('package/a')
+        self.assertPathExists('package/b')
         self.assertEqual(open('package-0.1/a').read(),
                open('package/a').read())
-        self.failUnlessExists('package_0.1.orig.tar.gz')
+        self.assertPathExists('package_0.1.orig.tar.gz')
 
=== modified file 'tests/test_hooks.py'
--- tests/test_hooks.py	2008-05-18 00:04:21 +0000
+++ tests/test_hooks.py	2011-06-13 23:06:02 +0000
@@ -20,11 +20,10 @@
 
 import os
 
-from bzrlib.tests import TestCaseInTempDir
-
 from bzrlib.plugins.builddeb.config import DebBuildConfig
 from bzrlib.plugins.builddeb.errors import HookFailedError
 from bzrlib.plugins.builddeb.hooks import run_hook
+from bzrlib.plugins.builddeb.tests import TestCaseInTempDir
 
 class MockTree:
   def abspath(self, relpath):
@@ -67,7 +66,7 @@
       f.close()
     config = DebBuildConfig([(self.default_conf, False)])
     run_hook(MockTree(), 'pre-build', config)
-    self.failUnlessExists('a')
+    self.assertPathExists('a')
 
   def test_run_hook_uses_passed_wd(self):
     os.mkdir('dir')
@@ -78,7 +77,7 @@
       f.close()
     config = DebBuildConfig([(self.default_conf, False)])
     run_hook(MockTree(), 'pre-build', config, wd='dir')
-    self.failUnlessExists('dir/a')
+    self.assertPathExists('dir/a')
 
   def test_run_hook_uses_shell(self):
     f = open(self.default_conf, 'wb')
@@ -88,8 +87,8 @@
       f.close()
     config = DebBuildConfig([(self.default_conf, False)])
     run_hook(MockTree(), 'post-build', config)
-    self.failUnlessExists('a')
-    self.failUnlessExists('b')
+    self.assertPathExists('a')
+    self.assertPathExists('b')
 
   def test_run_hook_uses_local_over_global(self):
     f = open(self.default_conf, 'wb')
@@ -105,7 +104,7 @@
     config = DebBuildConfig([(self.local_conf, False),
                              (self.default_conf, False)])
     run_hook(MockTree(), 'post-build', config)
-    self.failIfExists('a')
-    self.failUnlessExists('b')
+    self.assertPathDoesNotExist('a')
+    self.assertPathExists('b')
 
 # vim: ts=2 sts=2 sw=2
 
=== modified file 'tests/test_merge_package.py'
--- tests/test_merge_package.py	2010-08-19 07:14:39 +0000
+++ tests/test_merge_package.py	2011-06-13 23:06:02 +0000
@@ -28,13 +28,13 @@
     # Prior to 0.1.15 the debian module was called debian_bundle
     from debian_bundle.changelog import Version
 
-from bzrlib.tests import TestCaseWithTransport
-
 from bzrlib.plugins.builddeb import merge_package as MP
 from bzrlib.plugins.builddeb.errors import (
     SharedUpstreamConflictsWithTargetPackaging)
 from bzrlib.plugins.builddeb.import_dsc import DistributionBranch
 
+from bzrlib.plugins.builddeb.tests import TestCaseWithTransport
+
 _Debian_changelog = '''\
 ipsec-tools (%s) unstable; urgency=high
 
 
=== modified file 'tests/test_repack_tarball.py'
--- tests/test_repack_tarball.py	2011-02-27 10:38:10 +0000
+++ tests/test_repack_tarball.py	2011-06-13 23:06:02 +0000
@@ -24,13 +24,12 @@
 from bzrlib.errors import (NoSuchFile,
                            FileExists,
                            )
-from bzrlib.tests import TestCaseInTempDir
-
 from bzrlib.plugins.builddeb.errors import UnsupportedRepackFormat
 from bzrlib.plugins.builddeb.repack_tarball import (
         repack_tarball,
         get_repacker_class,
         )
+from bzrlib.plugins.builddeb.tests import TestCaseInTempDir
 
 
 def touch(filename):
@@ -66,7 +65,7 @@
 
     def test_create_old_tarball(self):
         self.create_old_tarball()
-        self.failUnlessExists(self.old_tarball)
+        self.assertPathExists(self.old_tarball)
 
     def test_repack_tarball_non_extant(self):
         error = NoSuchFile
@@ -86,8 +85,8 @@
     def test_repack_tarball_creates_new(self):
         self.create_old_tarball()
         repack_tarball(self.old_tarball, self.new_tarball)
-        self.failUnlessExists(self.old_tarball)
-        self.failUnlessExists(self.new_tarball)
+        self.assertPathExists(self.old_tarball)
+        self.assertPathExists(self.new_tarball)
 
     def test_repack_tarball_contents(self):
         self.create_old_tarball()
@@ -107,20 +106,20 @@
         self.create_old_tarball()
         target_dir = 'tarballs'
         repack_tarball(self.old_tarball, self.new_tarball, target_dir=target_dir)
-        self.failUnlessExists(target_dir)
-        self.failUnlessExists(os.path.join(target_dir, self.new_tarball))
-        self.failUnlessExists(self.old_tarball)
-        self.failIfExists(self.new_tarball)
+        self.assertPathExists(target_dir)
+        self.assertPathExists(os.path.join(target_dir, self.new_tarball))
+        self.assertPathExists(self.old_tarball)
+        self.assertPathDoesNotExist(self.new_tarball)
 
     def test_repack_tarball_with_target_dir_exists(self):
         self.create_old_tarball()
         target_dir = 'tarballs'
         os.mkdir(target_dir)
         repack_tarball(self.old_tarball, self.new_tarball, target_dir=target_dir)
-        self.failUnlessExists(target_dir)
-        self.failUnlessExists(os.path.join(target_dir, self.new_tarball))
-        self.failUnlessExists(self.old_tarball)
-        self.failIfExists(self.new_tarball)
+        self.assertPathExists(target_dir)
+        self.assertPathExists(os.path.join(target_dir, self.new_tarball))
+        self.assertPathExists(self.old_tarball)
+        self.assertPathDoesNotExist(self.new_tarball)
 
     def test_repack_tarball_with_target_dir_not_dir(self):
         self.create_old_tarball()
@@ -129,7 +128,7 @@
         # transport gives NoSuchFile rather than NotADirectory for this
         self.assertRaises(NoSuchFile, repack_tarball, self.old_tarball,
                           self.new_tarball, target_dir=target_dir)
-        self.failUnlessExists(self.old_tarball)
-        self.failIfExists(self.new_tarball)
-        self.failIfExists(os.path.join(target_dir, self.new_tarball))
-        self.failUnlessExists(target_dir)
+        self.assertPathExists(self.old_tarball)
+        self.assertPathDoesNotExist(self.new_tarball)
+        self.assertPathDoesNotExist(os.path.join(target_dir, self.new_tarball))
+        self.assertPathExists(target_dir)
 
=== modified file 'tests/test_repack_tarball_extra.py'
--- tests/test_repack_tarball_extra.py	2010-08-19 00:15:35 +0000
+++ tests/test_repack_tarball_extra.py	2011-06-13 23:06:02 +0000
@@ -72,7 +72,7 @@
         old_tarball = 'package-0.2.INVALID'
         f = open(old_tarball, 'w')
         f.close()
-        self.failUnlessExists(old_tarball)
+        self.assertPathExists(old_tarball)
         self.assertRaises(UnsupportedRepackFormat, repack_tarball, old_tarball,
                           'package_0.2.orig.tar.gz')
 
@@ -86,8 +86,8 @@
         make_new_upstream_tarball(os.path.join(target_dir, tarball_name))
         self.assertRaises(FileExists, repack_tarball, tarball_name,
             tarball_name, target_dir=target_dir)
-        self.failUnlessExists(tarball_name)
-        self.failUnlessExists(os.path.join(target_dir, tarball_name))
+        self.assertPathExists(tarball_name)
+        self.assertPathExists(os.path.join(target_dir, tarball_name))
 
     def test_conditional_repack_tarball_same(self):
         tarball_name = 'package-0.2.tar.gz'
@@ -97,8 +97,8 @@
         os.mkdir(target_dir)
         shutil.copy(tarball_name, target_dir)
         repack_tarball(tarball_name, tarball_name, target_dir=target_dir)
-        self.failUnlessExists(tarball_name)
-        self.failUnlessExists(os.path.join(target_dir, tarball_name))
+        self.assertPathExists(tarball_name)
+        self.assertPathExists(os.path.join(target_dir, tarball_name))
 
     def test_conditional_repack_different_formats(self):
         tarball_name = 'package-0.2.tar.gz'
@@ -111,8 +111,8 @@
         make_new_upstream_tarball(os.path.join(target_dir, tarball_name))
         self.assertRaises(FileExists, repack_tarball, bz2_tarball_name,
             tarball_name, target_dir=target_dir)
-        self.failUnlessExists(bz2_tarball_name)
-        self.failUnlessExists(os.path.join(target_dir, tarball_name))
+        self.assertPathExists(bz2_tarball_name)
+        self.assertPathExists(os.path.join(target_dir, tarball_name))
 
     def test_exists_not_force_gz(self):
         bz2_tarball_name = 'package-0.2.tar.bz2'
@@ -120,7 +120,7 @@
         make_new_upstream_tarball_bz2(bz2_tarball_name)
         repack_tarball(bz2_tarball_name, bz2_tarball_name, target_dir=".",
                 force_gz=False)
-        self.failUnlessExists(bz2_tarball_name)
+        self.assertPathExists(bz2_tarball_name)
 
     def test_exists_different_bz2(self):
         bz2_tarball_name = 'package-0.2.tar.bz2'
@@ -132,5 +132,5 @@
         make_new_upstream_tarball(os.path.join(target_dir, bz2_tarball_name))
         self.assertRaises(FileExists, repack_tarball, bz2_tarball_name,
             bz2_tarball_name, target_dir=target_dir)
-        self.failUnlessExists(bz2_tarball_name)
-        self.failUnlessExists(os.path.join(target_dir, bz2_tarball_name))
+        self.assertPathExists(bz2_tarball_name)
+        self.assertPathExists(os.path.join(target_dir, bz2_tarball_name))
 
=== modified file 'tests/test_source_distiller.py'
--- tests/test_source_distiller.py	2011-01-24 05:46:47 +0000
+++ tests/test_source_distiller.py	2011-06-13 23:06:02 +0000
@@ -26,22 +26,24 @@
     from debian_bundle.changelog import Version
 
 from bzrlib.errors import (
-        FileExists,
-        )
-from bzrlib.tests import TestCaseWithTransport
+    FileExists,
+    )
 
 from bzrlib.plugins.builddeb.errors import MissingUpstreamTarball
 from bzrlib.plugins.builddeb.source_distiller import (
-        FullSourceDistiller,
-        MergeModeDistiller,
-        NativeSourceDistiller,
-        )
-from bzrlib.plugins.builddeb.tests import SourcePackageBuilder
+    FullSourceDistiller,
+    MergeModeDistiller,
+    NativeSourceDistiller,
+    )
+from bzrlib.plugins.builddeb.tests import (
+    SourcePackageBuilder,
+    TestCaseWithTransport,
+    )
 from bzrlib.plugins.builddeb.tests.test_upstream import (
-        _MissingUpstreamProvider,
-        _SimpleUpstreamProvider,
-        _TouchUpstreamProvider,
-        )
+    _MissingUpstreamProvider,
+    _SimpleUpstreamProvider,
+    _TouchUpstreamProvider,
+    )
 
 
 class NativeSourceDistillerTests(TestCaseWithTransport):
@@ -64,8 +66,8 @@
         rev_tree = wt.basis_tree()
         sd = NativeSourceDistiller(rev_tree, None)
         sd.distill('target')
-        self.failUnlessExists('target')
-        self.failUnlessExists('target/a')
+        self.assertPathExists('target')
+        self.assertPathExists('target/a')
 
     def test_distill_removes_builddeb_dir(self):
         wt = self.make_branch_and_tree(".")
@@ -79,9 +81,9 @@
         rev_tree = wt.basis_tree()
         sd = NativeSourceDistiller(rev_tree, None)
         sd.distill('target')
-        self.failUnlessExists('target')
-        self.failUnlessExists('target/a')
-        self.failIfExists('target/.bzr-builddeb')
+        self.assertPathExists('target')
+        self.assertPathExists('target/a')
+        self.assertPathDoesNotExist('target/.bzr-builddeb')
 
     def test_distill_working_tree_with_symlinks(self):
         wt = self.make_branch_and_tree(".")
@@ -92,9 +94,9 @@
         wt.add(['a', 'b'])
         sd = NativeSourceDistiller(wt, None, is_working_tree=True)
         sd.distill('target')
-        self.failUnlessExists('target')
-        self.failUnlessExists('target/a')
-        self.failUnlessExists('target/b')
+        self.assertPathExists('target')
+        self.assertPathExists('target/a')
+        self.assertPathExists('target/b')
 
 
 class FullSourceDistillerTests(TestCaseWithTransport):
@@ -120,7 +122,7 @@
         self.addCleanup(wt.unlock)
         sd = FullSourceDistiller(wt, _TouchUpstreamProvider('tarball'))
         sd.distill('target')
-        self.failUnlessExists('tarball')
+        self.assertPathExists('tarball')
 
     def test_distill_revision_tree(self):
         wt = self.make_branch_and_tree(".")
@@ -130,10 +132,10 @@
         wt.add(['a', '.bzr-builddeb'])
         sd = FullSourceDistiller(wt, _TouchUpstreamProvider('tarball'))
         sd.distill('target')
-        self.failUnlessExists('tarball')
-        self.failUnlessExists('target')
-        self.failUnlessExists('target/a')
-        self.failIfExists('target/.bzr-builddeb')
+        self.assertPathExists('tarball')
+        self.assertPathExists('target')
+        self.assertPathExists('target/a')
+        self.assertPathDoesNotExist('target/.bzr-builddeb')
 
     def test_distill_working_tree_with_symlinks(self):
         wt = self.make_branch_and_tree(".")
@@ -145,9 +147,10 @@
         sd = FullSourceDistiller(wt, _TouchUpstreamProvider('tarball'),
                 is_working_tree=True)
         sd.distill('target')
-        self.failUnlessExists('target')
-        self.failUnlessExists('target/a')
-        self.failUnlessExists('target/b')
+        self.assertPathExists('target')
+        self.assertPathExists('target/a')
+        self.assertPathExists('target/b')
+
 
 class MergeModeDistillerTests(TestCaseWithTransport):
 
@@ -183,9 +186,9 @@
         sd = MergeModeDistiller(wt, _SimpleUpstreamProvider(name,
                     version.upstream_version, "."))
         sd.distill('target/foo')
-        self.failUnlessExists('target/%s_%s.orig.tar.gz'
+        self.assertPathExists('target/%s_%s.orig.tar.gz'
                 % (name, version.upstream_version))
-        self.failUnlessExists('target/foo/a')
+        self.assertPathExists('target/foo/a')
 
     def test_distill_exports_branch(self):
         wt = self.make_branch_and_tree('.')
@@ -199,8 +202,8 @@
         sd = MergeModeDistiller(wt, _SimpleUpstreamProvider(name,
                     version.upstream_version, "."))
         sd.distill('target/')
-        self.failUnlessExists('target/debian/a')
-        self.failIfExists('target/.bzr-builddeb')
+        self.assertPathExists('target/debian/a')
+        self.assertPathDoesNotExist('target/.bzr-builddeb')
 
     def test_distill_removes_debian(self):
         wt = self.make_branch_and_tree('.')
@@ -218,8 +221,8 @@
         sd = MergeModeDistiller(wt, _SimpleUpstreamProvider(name,
                     version.upstream_version, "."))
         sd.distill('target/')
-        self.failUnlessExists('target/a')
-        self.failIfExists('target/debian/foo')
+        self.assertPathExists('target/a')
+        self.assertPathDoesNotExist('target/debian/foo')
 
     def test_distill_larstiq(self):
         wt = self.make_branch_and_tree('.')
@@ -233,11 +236,11 @@
         sd = MergeModeDistiller(wt, _SimpleUpstreamProvider(name,
                     version.upstream_version, "."), larstiq=True)
         sd.distill('target/')
-        self.failUnlessExists('target/a')
-        self.failUnlessExists('target/debian/b')
-        self.failIfExists('target/debian/.bzr-builddeb')
-        self.failIfExists('target/.bzr-builddeb')
-        self.failIfExists('target/b')
+        self.assertPathExists('target/a')
+        self.assertPathExists('target/debian/b')
+        self.assertPathDoesNotExist('target/debian/.bzr-builddeb')
+        self.assertPathDoesNotExist('target/.bzr-builddeb')
+        self.assertPathDoesNotExist('target/b')
 
     def test_distill_use_existing(self):
         wt = self.make_branch_and_tree('.')
@@ -253,10 +256,10 @@
         self.build_tree(['target/', 'target/b', 'target/debian/',
                 'target/debian/b'])
         sd.distill('target/')
-        self.failUnlessExists('target/b')
-        self.failUnlessExists('target/debian/a')
-        self.failIfExists('target/a')
-        self.failIfExists('target/debian/b')
+        self.assertPathExists('target/b')
+        self.assertPathExists('target/debian/a')
+        self.assertPathDoesNotExist('target/a')
+        self.assertPathDoesNotExist('target/debian/b')
 
     def test_distill_working_tree_with_symlinks(self):
         wt = self.make_branch_and_tree(".")
@@ -271,6 +274,6 @@
         sd = MergeModeDistiller(wt, _SimpleUpstreamProvider(name,
                     version.upstream_version, "."), is_working_tree=True)
         sd.distill('target')
-        self.failUnlessExists('target')
-        self.failUnlessExists('target/debian/a')
-        self.failUnlessExists('target/debian/b')
+        self.assertPathExists('target')
+        self.assertPathExists('target/debian/a')
+        self.assertPathExists('target/debian/b')
 
=== modified file 'tests/test_upstream.py'
--- tests/test_upstream.py	2011-06-03 12:17:42 +0000
+++ tests/test_upstream.py	2011-06-13 23:06:02 +0000
@@ -36,7 +36,6 @@
 from bzrlib.tests import (
     Feature,
     TestCase,
-    TestCaseWithTransport,
     )
 from bzrlib.plugins.builddeb.config import (
     DebBuildConfig,
@@ -46,6 +45,9 @@
     PackageVersionNotPresent,
     WatchFileMissing,
     )
+from bzrlib.plugins.builddeb.tests import (
+    TestCaseWithTransport,
+    )
 from bzrlib.plugins.builddeb.upstream import (
     AptSource,
     StackedUpstreamSource,
@@ -336,7 +338,7 @@
         os.mkdir("mydir")
         self.assertEquals("mydir/foo_1.0.orig.tar.gz",
             source.fetch_tarball("foo", "1.0", "mydir"))
-        self.failUnlessExists("mydir/foo_1.0.orig.tar.gz")
+        self.assertPathExists("mydir/foo_1.0.orig.tar.gz")
 
     def test_fetch_tarball_not_found(self):
         source = UpstreamBranchSource(self.tree.branch)
@@ -402,7 +404,7 @@
         os.mkdir("mydir")
         self.assertEquals("mydir/foo_1.0.orig.tar.gz",
             source.fetch_tarball("foo", "1.0", "mydir"))
-        self.failUnlessExists("mydir/foo_1.0.orig.tar.gz")
+        self.assertPathExists("mydir/foo_1.0.orig.tar.gz")
         self.assertIsNot(None, source._upstream_branch)
 
     def test_fetch_tarball_not_found(self):
@@ -680,7 +682,7 @@
         os.mkdir("bar")
         self.assertEquals("bar/foo_1.0.orig.tar.gz",
             source.fetch_tarball("foo", "1.0", "bar"))
-        self.failUnlessExists("bar/foo_1.0.orig.tar.gz")
+        self.assertPathExists("bar/foo_1.0.orig.tar.gz")
 
     def test_fetch_tarball_repack(self):
         zf = zipfile.ZipFile("bla-2.0.zip", "w")
@@ -690,7 +692,7 @@
         os.mkdir("bar")
         self.assertEquals("bar/foo_2.0.orig.tar.gz",
             source.fetch_tarball("foo", "2.0", "bar"))
-        self.failUnlessExists("bar/foo_2.0.orig.tar.gz")
+        self.assertPathExists("bar/foo_2.0.orig.tar.gz")
 
     def test_fetch_tarball_not_present(self):
         source = TarfileSource("foo-1.0.tar.gz", "1.0")
@@ -707,7 +709,7 @@
         os.mkdir("bar")
         self.assertEquals("bar/foo_1.0.orig.tar.gz",
             source.fetch_tarball("foo", "1.0", "bar"))
-        self.failUnlessExists("bar/foo_1.0.orig.tar.gz")
+        self.assertPathExists("bar/foo_1.0.orig.tar.gz")
         gzip.open("bar/foo_1.0.orig.tar.gz").close()
 
 
 
=== modified file 'tests/test_util.py'
--- tests/test_util.py	2011-04-08 18:47:10 +0000
+++ tests/test_util.py	2011-06-13 23:06:02 +0000
@@ -38,39 +38,41 @@
     BUILD_TYPE_NORMAL,
     )
 from bzrlib.plugins.builddeb.errors import (MissingChangelogError,
-                AddChangelogError,
-                InconsistentSourceFormatError,
-                NoPreviousUpload,
-                )
-from bzrlib.plugins.builddeb.tests import SourcePackageBuilder
+    AddChangelogError,
+    InconsistentSourceFormatError,
+    NoPreviousUpload,
+    )
+from bzrlib.plugins.builddeb.tests import (
+    SourcePackageBuilder,
+    TestCaseInTempDir,
+    TestCaseWithTransport,
+    )
 from bzrlib.plugins.builddeb.util import (
-                  dget,
-                  dget_changes,
-                  find_bugs_fixed,
-                  find_changelog,
-                  find_extra_authors,
-                  find_last_distribution,
-                  _find_previous_upload,
-                  find_thanks,
-                  get_commit_info_from_changelog,
-                  get_source_format,
-                  guess_build_type,
-                  lookup_distribution,
-                  move_file_if_different,
-                  get_parent_dir,
-                  recursive_copy,
-                  safe_decode,
-                  strip_changelog_message,
-                  suite_to_distribution,
-                  tarball_name,
-                  write_if_different,
-                  )
+    dget,
+    dget_changes,
+    find_bugs_fixed,
+    find_changelog,
+    find_extra_authors,
+    find_last_distribution,
+    _find_previous_upload,
+    find_thanks,
+    get_commit_info_from_changelog,
+    get_source_format,
+    guess_build_type,
+    lookup_distribution,
+    move_file_if_different,
+    get_parent_dir,
+    recursive_copy,
+    safe_decode,
+    strip_changelog_message,
+    suite_to_distribution,
+    tarball_name,
+    write_if_different,
+    )
 
 from bzrlib import errors as bzr_errors
 from bzrlib.tests import (
     SymlinkFeature,
-    TestCaseWithTransport,
-    TestCaseInTempDir,
     TestCase,
     )
 
@@ -90,15 +92,15 @@
             f.close()
         os.mkdir('b/g')
         recursive_copy('a', 'b')
-        self.failUnlessExists('a')
-        self.failUnlessExists('b')
-        self.failUnlessExists('c')
-        self.failUnlessExists('b/d')
-        self.failUnlessExists('b/d/e')
-        self.failUnlessExists('b/f')
-        self.failUnlessExists('a/d')
-        self.failUnlessExists('a/d/e')
-        self.failUnlessExists('a/f')
+        self.assertPathExists('a')
+        self.assertPathExists('b')
+        self.assertPathExists('c')
+        self.assertPathExists('b/d')
+        self.assertPathExists('b/d/e')
+        self.assertPathExists('b/f')
+        self.assertPathExists('a/d')
+        self.assertPathExists('a/d/e')
+        self.assertPathExists('a/f')
 
 
 class SafeDecodeTests(TestCase):
@@ -325,13 +327,13 @@
     def test_move_file_non_extant(self):
         self.build_tree(['a'])
         move_file_if_different('a', 'b', None)
-        self.failIfExists('a')
-        self.failUnlessExists('b')
+        self.assertPathDoesNotExist('a')
+        self.assertPathExists('b')
 
     def test_move_file_samefile(self):
         self.build_tree(['a'])
         move_file_if_different('a', 'a', None)
-        self.failUnlessExists('a')
+        self.assertPathExists('a')
 
     def test_move_file_same_md5(self):
         self.build_tree(['a'])
@@ -343,8 +345,8 @@
             f.close()
         shutil.copy('a', 'b')
         move_file_if_different('a', 'b', md5sum.hexdigest())
-        self.failUnlessExists('a')
-        self.failUnlessExists('b')
+        self.assertPathExists('a')
+        self.assertPathExists('b')
 
     def test_move_file_diff_md5(self):
         self.build_tree(['a', 'b'])
@@ -364,8 +366,8 @@
         b_hexdigest = md5sum.hexdigest()
         self.assertNotEqual(a_hexdigest, b_hexdigest)
         move_file_if_different('a', 'b', a_hexdigest)
-        self.failIfExists('a')
-        self.failUnlessExists('b')
+        self.assertPathDoesNotExist('a')
+        self.assertPathExists('b')
         md5sum = md5.md5()
         f = open('b', 'rb')
         try:
@@ -379,23 +381,23 @@
 
     def test_write_non_extant(self):
         write_if_different("foo", 'a')
-        self.failUnlessExists('a')
+        self.assertPathExists('a')
         self.check_file_contents('a', "foo")
 
     def test_write_file_same(self):
         write_if_different("foo", 'a')
-        self.failUnlessExists('a')
+        self.assertPathExists('a')
         self.check_file_contents('a', "foo")
         write_if_different("foo", 'a')
-        self.failUnlessExists('a')
+        self.assertPathExists('a')
         self.check_file_contents('a', "foo")
 
     def test_write_file_different(self):
         write_if_different("foo", 'a')
-        self.failUnlessExists('a')
+        self.assertPathExists('a')
         self.check_file_contents('a', "foo")
         write_if_different("bar", 'a')
-        self.failUnlessExists('a')
+        self.assertPathExists('a')
         self.check_file_contents('a', "bar")
 
 
@@ -408,9 +410,9 @@
         builder.build()
         self.build_tree(["target/"])
         dget(builder.dsc_name(), 'target')
-        self.failUnlessExists(os.path.join("target", builder.dsc_name()))
-        self.failUnlessExists(os.path.join("target", builder.tar_name()))
-        self.failUnlessExists(os.path.join("target", builder.diff_name()))
+        self.assertPathExists(os.path.join("target", builder.dsc_name()))
+        self.assertPathExists(os.path.join("target", builder.tar_name()))
+        self.assertPathExists(os.path.join("target", builder.diff_name()))
 
     def test_dget_transport(self):
         builder = SourcePackageBuilder("package", Version("0.1-1"))
@@ -419,9 +421,9 @@
         builder.build()
         self.build_tree(["target/"])
         dget(self.get_url(builder.dsc_name()), 'target')
-        self.failUnlessExists(os.path.join("target", builder.dsc_name()))
-        self.failUnlessExists(os.path.join("target", builder.tar_name()))
-        self.failUnlessExists(os.path.join("target", builder.diff_name()))
+        self.assertPathExists(os.path.join("target", builder.dsc_name()))
+        self.assertPathExists(os.path.join("target", builder.tar_name()))
+        self.assertPathExists(os.path.join("target", builder.diff_name()))
 
     def test_dget_missing_dsc(self):
         builder = SourcePackageBuilder("package", Version("0.1-1"))
@@ -457,10 +459,10 @@
         builder.build()
         self.build_tree(["target/"])
         dget_changes(builder.changes_name(), 'target')
-        self.failUnlessExists(os.path.join("target", builder.dsc_name()))
-        self.failUnlessExists(os.path.join("target", builder.tar_name()))
-        self.failUnlessExists(os.path.join("target", builder.diff_name()))
-        self.failUnlessExists(os.path.join("target", builder.changes_name()))
+        self.assertPathExists(os.path.join("target", builder.dsc_name()))
+        self.assertPathExists(os.path.join("target", builder.tar_name()))
+        self.assertPathExists(os.path.join("target", builder.diff_name()))
+        self.assertPathExists(os.path.join("target", builder.changes_name()))
 
 
 class ParentDirTests(TestCase):