← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_conflicts.py

  • Committer: Olaf Conradi
  • Date: 2006-03-28 23:30:02 UTC
  • mto: (1661.1.1 bzr.mbp.remember)
  • mto: This revision was merged to the branch mainline in revision 1663.
  • Revision ID: olaf@conradi.org-20060328233002-f6262df0e19c1963
Added testcases for using pull with --remember. Moved remember code to
beginning of cmd_pull. This remembers the location in case of a failure
during pull.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
17
17
 
18
18
import os
19
19
 
20
 
from bzrlib.selftest import TestCaseInTempDir
 
20
from bzrlib.tests import TestCaseWithTransport
21
21
from bzrlib.branch import Branch
22
 
from bzrlib.commit import Commit
23
 
 
 
22
from bzrlib.conflicts import restore
 
23
from bzrlib.errors import NotConflicted
24
24
 
25
25
# TODO: Test commit with some added, and added-but-missing files
 
26
# RBC 20060124 is that not tested in test_commit.py ?
26
27
 
27
 
class TestConflicts(TestCaseInTempDir):
 
28
class TestConflicts(TestCaseWithTransport):
28
29
 
29
30
    def test_conflicts(self):
30
31
        """Conflicts are detected properly"""
31
 
        b = Branch.initialize('.')
32
 
        file('hello', 'w').write('hello world')
33
 
        file('hello.BASE', 'w').write('hello world')
 
32
        tree = self.make_branch_and_tree('.')
 
33
        b = tree.branch
 
34
        file('hello', 'w').write('hello world4')
 
35
        file('hello.THIS', 'w').write('hello world2')
 
36
        file('hello.BASE', 'w').write('hello world1')
 
37
        file('hello.OTHER', 'w').write('hello world3')
34
38
        file('hello.sploo.BASE', 'w').write('yellow world')
35
 
        tree = b.working_tree()
36
 
        self.assertEqual(len(list(tree.list_files())), 3)
 
39
        file('hello.sploo.OTHER', 'w').write('yellow world2')
 
40
        self.assertEqual(len(list(tree.list_files())), 6)
37
41
        conflicts = list(tree.iter_conflicts())
38
42
        self.assertEqual(len(conflicts), 2)
39
 
        assert 'hello' in conflicts
40
 
        assert 'hello.sploo' in conflicts
41
 
        os.unlink('hello.BASE')
42
 
        os.unlink('hello.sploo.BASE')
 
43
        self.assert_('hello' in conflicts)
 
44
        self.assert_('hello.sploo' in conflicts)
 
45
        restore('hello')
 
46
        restore('hello.sploo')
43
47
        self.assertEqual(len(list(tree.iter_conflicts())), 0)
44
 
 
 
48
        self.assertFileEqual('hello world2', 'hello')
 
49
        assert not os.path.lexists('hello.sploo')
 
50
        self.assertRaises(NotConflicted, restore, 'hello')
 
51
        self.assertRaises(NotConflicted, restore, 'hello.sploo')