/breezy-svn/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy-svn/trunk

« back to all changes in this revision

Viewing changes to tests/test_tree.py

  • Committer: Jelmer Vernooij
  • Date: 2020-01-31 19:40:01 UTC
  • Revision ID: jelmer@jelmer.uk-20200131194001-ri4z8wyq0cvymo20
More python3/breezy compat fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
60
60
    def test_root_id(self):
61
61
        tree = self.make_svn_branch_and_tree("d", "dc")
62
62
        tree = SvnBasisTree(tree)
63
 
        self.assertIs(None, tree.get_root_id())
 
63
        self.assertIs(None, tree.path2id(''))
64
64
 
65
65
    def test_executable(self):
66
66
        tree = self.make_svn_branch_and_tree("d", "dc")
134
134
 
135
135
        try:
136
136
            self.client_update("dc")
137
 
        except subvertpy.SubversionException, (msg, num):
138
 
            if num == subvertpy.ERR_WC_BAD_ADM_LOG:
 
137
        except subvertpy.SubversionException as e:
 
138
            if e.args[1] == subvertpy.ERR_WC_BAD_ADM_LOG:
139
139
                raise TestSkipped("Unable to run test with svn 1.4")
140
140
            raise
141
141
        tree = SvnBasisTree(tree)
217
217
 
218
218
        try:
219
219
            self.client_update("dc")
220
 
        except subvertpy.SubversionException, (msg, num):
221
 
            if num == subvertpy.ERR_WC_BAD_ADM_LOG:
 
220
        except subvertpy.SubversionException as e:
 
221
            if e.args[1] == subvertpy.ERR_WC_BAD_ADM_LOG:
222
222
                raise TestSkipped("Unable to run test with svn 1.4")
223
223
            raise
224
224