← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/versioning.py

  • Committer: Robert Collins
  • Date: 2005-10-22 13:27:47 UTC
  • Revision ID: robertc@robertcollins.net-20051022132747-706eed356bb1a11e
convert versioning tests to use self.run_bzr, making the test suite quieter

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/versioning.py
34
34
    
35
35
    def test_mkdir(self): 
36
36
        """Basic 'bzr mkdir' operation"""
37
 
        from bzrlib.commands import run_bzr
38
37
 
39
 
        run_bzr(['init'])
40
 
        run_bzr(['mkdir', 'foo'])
 
38
        self.run_bzr('init')
 
39
        self.run_bzr('mkdir', 'foo')
41
40
        self.assert_(os.path.isdir('foo'))
42
41
 
43
 
        self.assertRaises(OSError, run_bzr, ['mkdir', 'foo'])
 
42
        self.run_bzr('mkdir', 'foo', retcode=2)
44
43
 
45
44
        from bzrlib.diff import compare_trees
46
45
        from bzrlib.branch import Branch
80
79
        "bzr add" should add the parent(s) as necessary.
81
80
        """
82
81
        from bzrlib.branch import Branch
83
 
        from bzrlib.commands import run_bzr
84
82
        eq = self.assertEqual
85
83
 
86
84
        b = Branch.initialize('.')
87
85
 
88
86
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
89
87
        eq(list(b.unknowns()), ['inertiatic'])
90
 
        run_bzr(['add', 'inertiatic/esp'])
 
88
        self.run_bzr('add', 'inertiatic/esp')
91
89
        eq(list(b.unknowns()), [])
92
90
 
93
91
        # Multiple unversioned parents
94
92
        self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
95
93
        eq(list(b.unknowns()), ['veil'])
96
 
        run_bzr(['add', 'veil/cerpin/taxt'])
 
94
        self.run_bzr('add', 'veil/cerpin/taxt')
97
95
        eq(list(b.unknowns()), [])
98
96
 
99
97
        # Check whacky paths work
100
98
        self.build_tree(['cicatriz/', 'cicatriz/esp'])
101
99
        eq(list(b.unknowns()), ['cicatriz'])
102
 
        run_bzr(['add', 'inertiatic/../cicatriz/esp'])
 
100
        self.run_bzr('add', 'inertiatic/../cicatriz/esp')
103
101
        eq(list(b.unknowns()), [])
104
102
 
105
103
    def test_add_in_versioned(self):
108
106
        "bzr add" should do this happily.
109
107
        """
110
108
        from bzrlib.branch import Branch
111
 
        from bzrlib.commands import run_bzr
112
109
        eq = self.assertEqual
113
110
 
114
111
        b = Branch.initialize('.')
115
112
 
116
113
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
117
114
        eq(list(b.unknowns()), ['inertiatic'])
118
 
        run_bzr(['add', '--no-recurse', 'inertiatic'])
 
115
        self.run_bzr('add', '--no-recurse', 'inertiatic')
119
116
        eq(list(b.unknowns()), ['inertiatic'+os.sep+'esp'])
120
 
        run_bzr(['add', 'inertiatic/esp'])
 
117
        self.run_bzr('add', 'inertiatic/esp')
121
118
        eq(list(b.unknowns()), [])
122
119
 
123
120
    def test_subdir_add(self):
124
121
        """Add in subdirectory should add only things from there down"""
125
122
        
126
123
        from bzrlib.branch import Branch
127
 
        from bzrlib.commands import run_bzr
128
124
        
129
125
        eq = self.assertEqual
130
126
        ass = self.assert_
136
132
        eq(sorted(b.unknowns()),
137
133
           ['README', 'src'])
138
134
        
139
 
        eq(run_bzr(['add', 'src']), 0)
 
135
        self.run_bzr('add', 'src')
140
136
        
141
137
        self.build_tree(['src/foo.c'])
142
138
        
143
139
        chdir('src')
144
 
        eq(run_bzr(['add']), 0)
 
140
        self.run_bzr('add')
145
141
        
146
142
        eq(sorted(b.unknowns()), 
147
143
           ['README'])
148
144
        eq(len(b.inventory), 3)
149
145
                
150
146
        chdir('..')
151
 
        eq(run_bzr(['add']), 0)
 
147
        self.run_bzr('add')
152
148
        eq(list(b.unknowns()), [])
153
149
 
154
150
        self.check_branch()