Rev 4259: Some more cleanup. in file:///home/vila/src/bzr/bugs/355454-unicode-warning/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Thu Apr 16 17:50:06 BST 2009
At file:///home/vila/src/bzr/bugs/355454-unicode-warning/
------------------------------------------------------------
revno: 4259
revision-id: v.ladeuil+lp at free.fr-20090416165006-o3xlq80o3oneb8vc
parent: v.ladeuil+lp at free.fr-20090416141357-dowo6huqi1232fgm
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 355454-unicode-warning
timestamp: Thu 2009-04-16 18:50:06 +0200
message:
Some more cleanup.
* bzrlib/tests/test_bundle.py:
Fix some more imports.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_bundle.py'
--- a/bzrlib/tests/test_bundle.py 2009-04-16 14:13:57 +0000
+++ b/bzrlib/tests/test_bundle.py 2009-04-16 16:50:06 +0000
@@ -22,11 +22,14 @@
from bzrlib import (
bzrdir,
+ diff,
errors,
inventory,
+ merge,
osutils,
repository,
revision as _mod_revision,
+ tests,
treebuilder,
)
from bzrlib.bundle import read_mergeable_from_url
@@ -39,16 +42,8 @@
from bzrlib.bundle.serializer.v09 import BundleSerializerV09
from bzrlib.bundle.serializer.v4 import BundleSerializerV4
from bzrlib.branch import Branch
-from bzrlib.diff import internal_diff
-from bzrlib.merge import Merge3Merger
from bzrlib.repofmt import knitrepo
-from bzrlib.osutils import sha_file, sha_string
from bzrlib.tests import (
- SymlinkFeature,
- TestCase,
- TestCaseInTempDir,
- TestCaseWithTransport,
- TestSkipped,
test_read_bundle,
test_commit,
)
@@ -137,11 +132,11 @@
def contents_stats(self, file_id):
if file_id not in self.contents:
return None, None
- text_sha1 = sha_file(self.get_file(file_id))
+ text_sha1 = osutils.sha_file(self.get_file(file_id))
return text_sha1, len(self.contents[file_id])
-class BTreeTester(TestCase):
+class BTreeTester(tests.TestCase):
"""A simple unittest tester for the BundleTree class."""
def make_tree_1(self):
@@ -225,7 +220,7 @@
def unified_diff(self, old, new):
out = StringIO()
- internal_diff("old", old, "new", new, out)
+ diff.internal_diff("old", old, "new", new, out)
out.seek(0,0)
return out.read()
@@ -319,7 +314,7 @@
[inventory.ROOT_ID, 'a', 'b', 'd', 'e'])
-class BundleTester1(TestCaseWithTransport):
+class BundleTester1(tests.TestCaseWithTransport):
def test_mismatched_bundle(self):
format = bzrdir.BzrDirMetaFormat1()
@@ -366,12 +361,13 @@
def make_branch_and_tree(self, path, format=None):
if format is None:
format = self.bzrdir_format()
- return TestCaseWithTransport.make_branch_and_tree(self, path, format)
+ return tests.TestCaseWithTransport.make_branch_and_tree(
+ self, path, format)
def make_branch(self, path, format=None):
if format is None:
format = self.bzrdir_format()
- return TestCaseWithTransport.make_branch(self, path, format)
+ return tests.TestCaseWithTransport.make_branch(self, path, format)
def create_bundle_text(self, base_rev_id, rev_id):
bundle_txt = StringIO()
@@ -521,7 +517,7 @@
self.assert_(not repository.has_revision(rev.revision_id),
'Revision {%s} present before applying bundle'
% rev.revision_id)
- merge_bundle(info, to_tree, True, Merge3Merger, False, False)
+ merge_bundle(info, to_tree, True, merge.Merge3Merger, False, False)
for rev in info.real_revisions:
self.assert_(repository.has_revision(rev.revision_id),
@@ -664,7 +660,7 @@
def _test_symlink_bundle(self, link_name, link_target, new_link_target):
link_id = 'link-1'
- self.requireFeature(SymlinkFeature)
+ self.requireFeature(tests.SymlinkFeature)
self.tree1 = self.make_branch_and_tree('b1')
self.b1 = self.tree1.branch
@@ -818,12 +814,10 @@
return bundle_file.getvalue()
def test_unicode_bundle(self):
+ self.requireFeature(tests.UnicodeFilenameFeature)
# Handle international characters
os.mkdir('b1')
- try:
- f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
- except UnicodeEncodeError:
- raise TestSkipped("Filesystem doesn't support unicode")
+ f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
self.tree1 = self.make_branch_and_tree('b1')
self.b1 = self.tree1.branch
@@ -867,8 +861,8 @@
def test_whitespace_bundle(self):
if sys.platform in ('win32', 'cygwin'):
- raise TestSkipped('Windows doesn\'t support filenames'
- ' with tabs or trailing spaces')
+ raise tests.TestSkipped('Windows doesn\'t support filenames'
+ ' with tabs or trailing spaces')
self.tree1 = self.make_branch_and_tree('b1')
self.b1 = self.tree1.branch
@@ -1054,7 +1048,7 @@
repo = self.make_repo_with_installed_revisions()
recorded_inv_sha1 = repo.get_inventory_sha1('rev2')
xml = repo.get_inventory_xml('rev2')
- self.assertEqual(sha_string(xml), recorded_inv_sha1)
+ self.assertEqual(osutils.sha_string(xml), recorded_inv_sha1)
def test_across_models_incompatible(self):
tree = self.make_simple_tree('dirstate-with-subtree')
@@ -1063,7 +1057,7 @@
try:
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
except errors.IncompatibleBundleFormat:
- raise TestSkipped("Format 0.8 doesn't work with knit3")
+ raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
repo = self.make_repository('repo', format='knit')
bundle.install_revisions(repo)
@@ -1090,9 +1084,9 @@
try:
bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
except errors.IncompatibleBundleFormat:
- raise TestSkipped("Format 0.8 doesn't work with knit3")
+ raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
if isinstance(bundle, v09.BundleInfo09):
- raise TestSkipped("Format 0.9 doesn't work with subtrees")
+ raise tests.TestSkipped("Format 0.9 doesn't work with subtrees")
repo = self.make_repository('repo', format='knit')
self.assertRaises(errors.IncompatibleRevision,
bundle.install_revisions, repo)
@@ -1105,8 +1099,8 @@
try:
self.tree1.commit('Revision/id/with/slashes', rev_id='rev/id')
except ValueError:
- raise TestSkipped("Repository doesn't support revision ids with"
- " slashes")
+ raise tests.TestSkipped(
+ "Repository doesn't support revision ids with slashes")
bundle = self.get_valid_bundle('null:', 'rev/id')
def test_skip_file(self):
@@ -1128,7 +1122,7 @@
self.tree1.commit('rev3', rev_id='rev3')
bundle = self.get_valid_bundle('reva', 'rev3')
if getattr(bundle, 'get_bundle_reader', None) is None:
- raise TestSkipped('Bundle format cannot provide reader')
+ raise tests.TestSkipped('Bundle format cannot provide reader')
# be sure that file1 comes before file2
for b, m, k, r, f in bundle.get_bundle_reader().iter_records():
if f == 'file3-id':
@@ -1137,7 +1131,7 @@
bundle.install_revisions(target.branch.repository)
-class V08BundleTester(BundleTester, TestCaseWithTransport):
+class V08BundleTester(BundleTester, tests.TestCaseWithTransport):
format = '0.8'
@@ -1276,7 +1270,7 @@
return format
-class V4BundleTester(BundleTester, TestCaseWithTransport):
+class V4BundleTester(BundleTester, tests.TestCaseWithTransport):
format = '4'
@@ -1487,7 +1481,7 @@
self.check_valid(bundle)
-class MungedBundleTesterV09(TestCaseWithTransport, MungedBundleTester):
+class MungedBundleTesterV09(tests.TestCaseWithTransport, MungedBundleTester):
format = '0.9'
@@ -1525,12 +1519,12 @@
self.check_valid(bundle)
-class MungedBundleTesterV4(TestCaseWithTransport, MungedBundleTester):
+class MungedBundleTesterV4(tests.TestCaseWithTransport, MungedBundleTester):
format = '4'
-class TestBundleWriterReader(TestCase):
+class TestBundleWriterReader(tests.TestCase):
def test_roundtrip_record(self):
fileobj = StringIO()
@@ -1601,7 +1595,7 @@
self.assertRaises(errors.BadBundle, record_iter.next)
-class TestReadMergeableFromUrl(TestCaseWithTransport):
+class TestReadMergeableFromUrl(tests.TestCaseWithTransport):
def test_read_mergeable_skips_local(self):
"""A local bundle named like the URL should not be read.
More information about the bazaar-commits
mailing list