~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

• browse files at revision 1554
• compare with another revision
• compare with revision 1185.33.36
• download diff
• download tarball
• view history from revision 1554

Show diffs side-by-side

added

removed

bzrlib/tests/blackbox/test_too_much.py

41

41

import sys

42

42

 

43

43

from bzrlib.branch import Branch

 

44

import bzrlib.bzrdir as bzrdir

44

45

from bzrlib.errors import BzrCommandError

45

46

from bzrlib.osutils import has_symlinks, pathjoin

46

47

from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver

51

52

 

52

53

class TestCommands(ExternalBase):

53

54

 

54

 

    def test_help_commands(self):

55

 

        self.runbzr('--help')

56

 

        self.runbzr('help')

57

 

        self.runbzr('help commands')

58

 

        self.runbzr('help help')

59

 

        self.runbzr('commit -h')

60

 

 

61

55

    def test_init_branch(self):

62

56

        self.runbzr(['init'])

63

57

 

117

111

        nick = self.runbzr("nick",backtick=True)

118

112

        self.assertEqual(nick, 'moo\n')

119

113

 

120

 

 

121

114

    def test_invalid_commands(self):

122

115

        self.runbzr("pants", retcode=3)

123

116

        self.runbzr("--pants off", retcode=3)

124

117

        self.runbzr("diff --message foo", retcode=3)

125

118

 

126

 

    def test_empty_commit(self):

127

 

        self.runbzr("init")

128

 

        self.build_tree(['hello.txt'])

129

 

        self.runbzr("commit -m empty", retcode=3)

130

 

        self.runbzr("add hello.txt")

131

 

        self.runbzr("commit -m added")       

132

 

 

133

 

    def test_empty_commit_message(self):

134

 

        self.runbzr("init")

135

 

        file('foo.c', 'wt').write('int main() {}')

136

 

        self.runbzr(['add', 'foo.c'])

137

 

        self.runbzr(["commit", "-m", ""] , retcode=3) 

138

 

 

139

119

    def test_remove_deleted(self):

140

120

        self.runbzr("init")

141

121

        self.build_tree(['a'])

144

124

        os.unlink('a')

145

125

        self.runbzr(['remove', 'a'])

146

126

 

147

 

    def test_other_branch_commit(self):

148

 

        # this branch is to ensure consistent behaviour, whether we're run

149

 

        # inside a branch, or not.

150

 

        os.mkdir('empty_branch')

151

 

        os.chdir('empty_branch')

152

 

        self.runbzr('init')

153

 

        os.mkdir('branch')

154

 

        os.chdir('branch')

155

 

        self.runbzr('init')

156

 

        file('foo.c', 'wt').write('int main() {}')

157

 

        file('bar.c', 'wt').write('int main() {}')

158

 

        os.chdir('..')

159

 

        self.runbzr(['add', 'branch/foo.c'])

160

 

        self.runbzr(['add', 'branch'])

161

 

        # can't commit files in different trees; sane error

162

 

        self.runbzr('commit -m newstuff branch/foo.c .', retcode=3)

163

 

        self.runbzr('commit -m newstuff branch/foo.c')

164

 

        self.runbzr('commit -m newstuff branch')

165

 

        self.runbzr('commit -m newstuff branch', retcode=3)

166

 

 

167

127

    def test_ignore_patterns(self):

168

128

        self.runbzr('init')

169

129

        self.assertEquals(self.capture('unknowns'), '')

241

201

        self.runbzr('revert')

242

202

        os.chdir('..')

243

203

 

244

 

    def test_status(self):

245

 

        self.runbzr("init")

246

 

        self.build_tree(['hello.txt'])

247

 

        result = self.runbzr("status")

248

 

        self.assert_("unknown:\n  hello.txt\n" in result, result)

249

 

        self.runbzr("add hello.txt")

250

 

        result = self.runbzr("status")

251

 

        self.assert_("added:\n  hello.txt\n" in result, result)

252

 

        self.runbzr("commit -m added")

253

 

        result = self.runbzr("status -r 0..1")

254

 

        self.assert_("added:\n  hello.txt\n" in result, result)

255

 

        self.build_tree(['world.txt'])

256

 

        result = self.runbzr("status -r 0")

257

 

        self.assert_("added:\n  hello.txt\n" \

258

 

                     "unknown:\n  world.txt\n" in result, result)

259

 

 

260

204

    def test_mv_modes(self):

261

205

        """Test two modes of operation for mv"""

262

206

        self.runbzr('init')

357

301

        os.chdir('b')

358

302

        self.runbzr('commit -m foo --unchanged')

359

303

        os.chdir('..')

360

 

        # naughty - abstraction violations RBC 20050928  

361

 

        print "test_branch used to delete the stores, how is this meant to work ?"

362

 

        #shutil.rmtree('a/.bzr/revision-store')

363

 

        #shutil.rmtree('a/.bzr/inventory-store', ignore_errors=True)

364

 

        #shutil.rmtree('a/.bzr/text-store', ignore_errors=True)

365

 

        self.runbzr('branch a d --basis b')

 

304

 

 

305

    def test_branch_basis(self):

 

306

        # ensure that basis really does grab from the basis by having incomplete source

 

307

        tree = self.make_branch_and_tree('commit_tree')

 

308

        self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))

 

309

        tree.add('foo')

 

310

        tree.commit('revision 1', rev_id='1')

 

311

        source = self.make_branch_and_tree('source')

 

312

        # this gives us an incomplete repository

 

313

        tree.bzrdir.open_repository().copy_content_into(source.branch.repository)

 

314

        tree.commit('revision 2', rev_id='2', allow_pointless=True)

 

315

        tree.bzrdir.open_branch().copy_content_into(source.branch)

 

316

        tree.copy_content_into(source)

 

317

        self.assertFalse(source.branch.repository.has_revision('2'))

 

318

        dir = source.bzrdir

 

319

        self.runbzr('branch source target --basis commit_tree')

 

320

        target = bzrdir.BzrDir.open('target')

 

321

        self.assertEqual('2', target.open_branch().last_revision())

 

322

        self.assertEqual('2', target.open_workingtree().last_revision())

 

323

        self.assertTrue(target.open_branch().repository.has_revision('2'))

366

324

 

367

325

    def test_merge(self):

368

326

        from bzrlib.branch import Branch

392

350

        self.runbzr('merge ../b -r last:1')

393

351

        self.check_file_contents('goodbye', 'quux')

394

352

        # Merging a branch pulls its revision into the tree

395

 

        a = Branch.open('.')

 

353

        a = WorkingTree.open('.')

396

354

        b = Branch.open('../b')

397

 

        a.repository.get_revision_xml(b.last_revision())

398

 

        self.log('pending merges: %s', a.working_tree().pending_merges())

399

 

        self.assertEquals(a.working_tree().pending_merges(),

 

355

        a.branch.repository.get_revision_xml(b.last_revision())

 

356

        self.log('pending merges: %s', a.pending_merges())

 

357

        self.assertEquals(a.pending_merges(),

400

358

                          [b.last_revision()])

401

359

        self.runbzr('commit -m merged')

402

360

        self.runbzr('merge ../b -r last:1')

403

 

        self.assertEqual(Branch.open('.').working_tree().pending_merges(), [])

 

361

        self.assertEqual(a.pending_merges(), [])

404

362

 

405

363

    def test_merge_with_missing_file(self):

406

364

        """Merge handles missing file conflicts"""

704

662

        ass = self.assert_

705

663

        chdir = os.chdir

706

664

        

707

 

        t = WorkingTree.create_standalone('.')

 

665

        t = self.make_branch_and_tree('.')

708

666

        b = t.branch

709

667

        self.build_tree(['src/', 'README'])

710

668

        

830

788

        self.runbzr('commit -m conflicts')

831

789

        self.assertEquals(result, "")

832

790

 

833

 

    def test_resign(self):

834

 

        """Test re signing of data."""

835

 

        import bzrlib.gpg

836

 

        oldstrategy = bzrlib.gpg.GPGStrategy

837

 

        wt = WorkingTree.create_standalone('.')

838

 

        branch = wt.branch

839

 

        wt.commit("base", allow_pointless=True, rev_id='A')

840

 

        try:

841

 

            # monkey patch gpg signing mechanism

842

 

            from bzrlib.testament import Testament

843

 

            bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy

844

 

            self.runbzr('re-sign -r revid:A')

845

 

            self.assertEqual(Testament.from_revision(branch.repository,

846

 

                             'A').as_short_text(),

847

 

                             branch.repository.revision_store.get('A', 

848

 

                             'sig').read())

849

 

        finally:

850

 

            bzrlib.gpg.GPGStrategy = oldstrategy

851

 

            

852

 

    def test_resign_range(self):

853

 

        import bzrlib.gpg

854

 

        oldstrategy = bzrlib.gpg.GPGStrategy

855

 

        wt = WorkingTree.create_standalone('.')

856

 

        branch = wt.branch

857

 

        wt.commit("base", allow_pointless=True, rev_id='A')

858

 

        wt.commit("base", allow_pointless=True, rev_id='B')

859

 

        wt.commit("base", allow_pointless=True, rev_id='C')

860

 

        try:

861

 

            # monkey patch gpg signing mechanism

862

 

            from bzrlib.testament import Testament

863

 

            bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy

864

 

            self.runbzr('re-sign -r 1..')

865

 

            self.assertEqual(

866

 

                Testament.from_revision(branch.repository,'A').as_short_text(),

867

 

                branch.repository.revision_store.get('A', 'sig').read())

868

 

            self.assertEqual(

869

 

                Testament.from_revision(branch.repository,'B').as_short_text(),

870

 

                branch.repository.revision_store.get('B', 'sig').read())

871

 

            self.assertEqual(Testament.from_revision(branch.repository,

872

 

                             'C').as_short_text(),

873

 

                             branch.repository.revision_store.get('C', 

874

 

                             'sig').read())

875

 

        finally:

876

 

            bzrlib.gpg.GPGStrategy = oldstrategy

877

 

 

878

791

    def test_push(self):

879

792

        # create a source branch

880

793

        os.mkdir('my-branch')

1255

1168

 

1256

1169

    def test_branch(self):

1257

1170

        os.mkdir('from')

1258

 

        wt = WorkingTree.create_standalone('from')

 

1171

        wt = self.make_branch_and_tree('from')

1259

1172

        branch = wt.branch

1260

1173

        wt.commit('empty commit for nonsense', allow_pointless=True)

1261

 

        url = self.get_remote_url('from')

 

1174

        url = self.get_readonly_url('from')

1262

1175

        self.run_bzr('branch', url, 'to')

1263

1176

        branch = Branch.open('to')

1264

1177

        self.assertEqual(1, len(branch.revision_history()))

 

1178

        # the branch should be set in to to from

 

1179

        self.assertEqual(url + '/', branch.get_parent())

1265

1180

 

1266

1181

    def test_log(self):

1267

1182

        self.build_tree(['branch/', 'branch/file'])

1268

1183

        self.capture('init branch')

1269

1184

        self.capture('add branch/file')

1270

1185

        self.capture('commit -m foo branch')

1271

 

        url = self.get_remote_url('branch/file')

 

1186

        url = self.get_readonly_url('branch/file')

1272

1187

        output = self.capture('log %s' % url)

1273

1188

        self.assertEqual(8, len(output.split('\n')))

1274

1189

        

1277

1192

        self.capture('init branch')

1278

1193

        self.capture('add branch/file')

1279

1194

        self.capture('commit -m foo branch')

1280

 

        url = self.get_remote_url('branch/')

 

1195

        url = self.get_readonly_url('branch/')

1281

1196

        self.run_bzr('check', url)

1282

1197

    

1283

1198

    

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1