/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 bzrlib/tests/blackbox/test_modified.py

  • Committer: Robert Collins
  • Date: 2010-05-11 08:36:16 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100511083616-b8fjb19zomwupid0
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006 Canonical Ltd
2
2
# -*- coding: utf-8 -*-
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
70
70
        tree.commit(message='modified %s' %(name))
71
71
        check_modified('')
72
72
 
73
 
    def test_modified_directory(self):
74
 
        """Test --directory option"""
75
 
        tree = self.make_branch_and_tree('a')
76
 
        self.build_tree(['a/README'])
77
 
        tree.add('README')
78
 
        tree.commit('r1')
79
 
        self.build_tree_contents([('a/README', 'changed\n')])
80
 
        out, err = self.run_bzr(['modified', '--directory=a'])
81
 
        self.assertEquals('README\n', out)