← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_conflicts.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-09 17:27:46 UTC
  • mto: (5029.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5030.
  • Revision ID: v.ladeuil+lp@free.fr-20100209172746-6f4mvlnr2mac807j
Move NoSmartTransportServer to bzrlib.tests.test_server

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_conflicts.py
1
 
# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2006, 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
70
70
        out, err = self.run_bzr('conflicts --text')
71
71
        self.assertEqual(['my_other_file', 'myfile'], out.splitlines())
72
72
 
73
 
    def test_conflicts_directory(self):
74
 
        """Test --directory option"""
75
 
        out, err = self.run_bzr('conflicts --directory a', working_dir='.')
76
 
        self.assertEqual(3, len(out.splitlines()))
77
 
        self.assertEqual('', err)
78
 
 
79
73
 
80
74
class TestResolve(TestConflictsBase):
81
75
 
119
113
        self.build_tree_contents([('tree/file', 'a\n')])
120
114
        note = self.run_bzr('resolve', working_dir='tree')[1]
121
115
        self.assertContainsRe(note, 'All conflicts resolved.')
122
 
 
123
 
    def test_resolve_all_directory(self):
124
 
        """Test --directory option"""
125
 
        out, err = self.run_bzr('resolve --all -d a', working_dir='.')
126
 
        self.assertEqual('', err)
127
 
        out, err = self.run_bzr('conflicts')
128
 
        self.assertEqual(0, len(out.splitlines()))