/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_transactions.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_transactions.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2009, 2011 Canonical Ltd
2
2
#   Authors: Robert Collins <robert.collins@canonical.com>
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
17
17
 
18
18
"""Tests for the behaviour of the Transaction concept in bzr."""
19
19
 
20
 
# import system imports here
21
 
import os
22
 
import sys
23
 
 
24
 
#import bzrlib specific imports here
25
 
import bzrlib.errors as errors
26
 
from bzrlib.tests import TestCase, TestCaseInTempDir
27
 
import bzrlib.transactions as transactions
 
20
#import breezy specific imports here
 
21
import breezy.errors as errors
 
22
from breezy.tests import TestCase
 
23
import breezy.transactions as transactions
28
24
 
29
25
 
30
26
class DummyWeave(object):
46
42
class TestSymbols(TestCase):
47
43
 
48
44
    def test_public_symbols(self):
49
 
        from bzrlib.transactions import ReadOnlyTransaction
50
 
        from bzrlib.transactions import PassThroughTransaction
 
45
        from breezy.transactions import ReadOnlyTransaction
 
46
        from breezy.transactions import PassThroughTransaction
51
47
 
52
48
 
53
49
class TestReadOnlyTransaction(TestCase):
61
57
 
62
58
    def test_register_dirty_raises(self):
63
59
        self.assertRaises(errors.ReadOnlyError,
64
 
                          self.transaction.register_dirty,"anobject")
 
60
                          self.transaction.register_dirty, "anobject")
65
61
 
66
62
    def test_map(self):
67
63
        self.assertNotEqual(None, getattr(self.transaction, "map", None))