BzrTools

Merge lp:~jr/bzrtools/bzrtools-test-import into lp:bzrtools

  1. bzrtools-test-import
  2. Merge into bzrtools.dev
Proposed by Jonathan Riddell
Status: Rejected
Rejected by: Aaron Bentley
Proposed branch: lp:~jr/bzrtools/bzrtools-test-import
Merge into: lp:bzrtools
Diff against target: 16 lines (+5/-1)
1 file modified
tests/test_link_tree.py (+5/-1)
To merge this branch: bzr merge lp:~jr/bzrtools/bzrtools-test-import
Reviewer Review Type Date Requested Status
Jonathan Riddell (community) Disapprove
Aaron Bentley Pending
Review via email: mp+76242@code.launchpad.net

Commit message

fix tests when running with bzr 2.5

Description of the change

fix tests when running with bzr 2.5

To post a comment you must log in.
Revision history for this message
Jonathan Riddell (jr) wrote :

jelmer already did this better in https://code.launchpad.net/~jelmer/bzrtools/fix-bzr.dev-compat/+merge/73156

review: Disapprove
Revision history for this message
Aaron Bentley (abentley) wrote :

Rejected per your comment.

Unmerged revisions

777. By Jonathan Riddell

fix tests when running with bzr 2.5

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/test_link_tree.py'
2--- tests/test_link_tree.py 2010-02-25 04:15:18 +0000
3+++ tests/test_link_tree.py 2011-09-20 15:19:24 +0000
4@@ -17,7 +17,11 @@
5 import os
6
7 from bzrlib.transform import TreeTransform
8-from bzrlib.tests import TestCaseWithTransport, HardlinkFeature
9+from bzrlib.tests import TestCaseWithTransport
10+try:
11+ from bzrlib.tests.features import HardlinkFeature
12+except ImportError: # bzr < 2.5
13+ from bzrlib.tests import HardlinkFeature
14
15 from bzrlib.plugins.bzrtools import command
16 from bzrlib.plugins.bzrtools.link_tree import link_tree

Subscribers

People subscribed via source and target branches