← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/blackbox.py

  • Committer: John Arbash Meinel
  • Date: 2005-09-16 14:57:59 UTC
  • mto: (1393.2.1)
  • mto: This revision was merged to the branch mainline in revision 1396.
  • Revision ID: john@arbash-meinel.com-20050916145758-ad06c9ae86840f17
Merged up-to-date against mainline, still broken.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
93
93
    def test_ignore_patterns(self):
94
94
        from bzrlib.branch import Branch
95
95
        
96
 
        b = Branch('.', init=True)
 
96
        b = Branch.initialize('.')
97
97
        self.assertEquals(list(b.unknowns()), [])
98
98
 
99
99
        file('foo.tmp', 'wt').write('tmp files are ignored')
150
150
    def test_mv_modes(self):
151
151
        """Test two modes of operation for mv"""
152
152
        from bzrlib.branch import Branch
153
 
        b = Branch('.', init=True)
 
153
        b = Branch.initialize('.')
154
154
        self.build_tree(['a', 'c', 'subdir/'])
155
155
        self.run_bzr('add', self.test_dir)
156
156
        self.run_bzr('mv', 'a', 'b')
214
214
        self.runbzr('merge ../b')
215
215
        self.check_file_contents('goodbye', 'quux')
216
216
        # Merging a branch pulls its revision into the tree
217
 
        a = Branch('.')
218
 
        b = Branch('../b')
 
217
        a = Branch.open('.')
 
218
        b = Branch.open('../b')
219
219
        a.get_revision_xml(b.last_patch())
220
220
        self.log('pending merges: %s', a.pending_merges())
221
221
        #        assert a.pending_merges() == [b.last_patch()], "Assertion %s %s" \
241
241
        self.runbzr('pull')
242
242
        self.runbzr('commit -m blah --unchanged')
243
243
        os.chdir('../a')
244
 
        a = Branch('.')
245
 
        b = Branch('../b')
 
244
        a = Branch.open('.')
 
245
        b = Branch.open('../b')
246
246
        assert a.revision_history() == b.revision_history()[:-1]
247
247
        self.runbzr('pull ../b')
248
248
        assert a.revision_history() == b.revision_history()
260
260
 
261
261
    def test_add_reports(self):
262
262
        """add command prints the names of added files."""
263
 
        b = Branch('.', init=True)
 
263
        b = Branch.initialize('.')
264
264
        self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
265
265
 
266
266
        from cStringIO import StringIO