← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2006-07-04 14:00:29 UTC
  • mto: (1711.2.74 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1837.
  • Revision ID: john@arbash-meinel.com-20060704140029-f7d23145ea05d75a
Add emacs ignores, remove old ignores

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_bundle.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006 by Canonical Ltd
2
2
# Authors: Aaron Bentley
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
21
21
 
22
22
from bzrlib.bundle.serializer import read_bundle
23
23
from bzrlib.bzrdir import BzrDir
24
 
from bzrlib import tests
25
 
 
26
 
 
27
 
class TestBundle(tests.TestCaseWithTransport):
 
24
from bzrlib.tests import TestCaseInTempDir
 
25
 
 
26
 
 
27
class TestBundle(TestCaseInTempDir):
28
28
 
29
29
    def make_trees(self):
30
30
        grandparent_tree = BzrDir.create_standalone_workingtree('grandparent')
37
37
 
38
38
    def test_uses_parent(self):
39
39
        """Parent location is used as a basis by default"""
40
 
        self.make_trees()
 
40
        self.make_trees()        
41
41
        os.chdir('grandparent')
42
42
        errmsg = self.run_bzr('bundle', retcode=3)[1]
43
43
        self.assertContainsRe(errmsg, 'No base branch known or specified')
52
52
 
53
53
    def test_uses_submit(self):
54
54
        """Submit location can be used and set"""
55
 
        self.make_trees()
 
55
        self.make_trees()        
56
56
        os.chdir('branch')
57
57
        br = read_bundle(StringIO(self.run_bzr('bundle')[0]))
58
58
        self.assertRevisions(br, ['revision3'])
59
 
        br = read_bundle(StringIO(self.run_bzr('bundle ../grandparent')[0]))
 
59
        br = read_bundle(StringIO(self.run_bzr('bundle', '../grandparent')[0]))
60
60
        self.assertRevisions(br, ['revision3', 'revision2'])
61
61
        # submit location should be auto-remembered
62
62
        br = read_bundle(StringIO(self.run_bzr('bundle')[0]))
63
63
        self.assertRevisions(br, ['revision3', 'revision2'])
64
 
        self.run_bzr('bundle ../parent')
 
64
        self.run_bzr('bundle', '../parent')
65
65
        br = read_bundle(StringIO(self.run_bzr('bundle')[0]))
66
66
        self.assertRevisions(br, ['revision3', 'revision2'])
67
 
        self.run_bzr('bundle ../parent --remember')
 
67
        self.run_bzr('bundle', '../parent', '--remember')
68
68
        br = read_bundle(StringIO(self.run_bzr('bundle')[0]))
69
69
        self.assertRevisions(br, ['revision3'])
70
 
        err = self.run_bzr('bundle --remember', retcode=3)[1]
71
 
        self.assertContainsRe(err,
 
70
        err = self.run_bzr('bundle', '--remember', retcode=3)[1]
 
71
        self.assertContainsRe(err, 
72
72
                              '--remember requires a branch to be specified.')
73
73
 
74
74
    def test_revision_branch_interaction(self):
75
 
        self.make_trees()
 
75
        self.make_trees()        
76
76
        os.chdir('branch')
77
 
        bi = read_bundle(StringIO(self.run_bzr('bundle ../grandparent')[0]))
 
77
        bi = read_bundle(StringIO(self.run_bzr('bundle', '../grandparent')[0]))
78
78
        self.assertRevisions(bi, ['revision3', 'revision2'])
79
 
        out = StringIO(self.run_bzr('bundle ../grandparent -r -2')[0])
 
79
        out = StringIO(self.run_bzr('bundle', '../grandparent', '-r', '-2')[0])
80
80
        bi = read_bundle(out)
81
81
        self.assertRevisions(bi, ['revision2'])
82
 
        bi = read_bundle(StringIO(self.run_bzr('bundle -r -2..-1')[0]))
 
82
        bi = read_bundle(StringIO(self.run_bzr('bundle', '-r', '-2..-1')[0]))
83
83
        self.assertRevisions(bi, ['revision3'])
84
 
        self.run_bzr('bundle ../grandparent -r -2..-1', retcode=3)
85
 
 
86
 
    def test_output(self):
87
 
        # check output for consistency
88
 
        # win32 stdout converts LF to CRLF,
89
 
        # and this is breaks the created bundle
90
 
        self.make_trees()
91
 
        os.chdir('branch')
92
 
        stdout = self.run_bzr_subprocess('bundle')[0]
93
 
        br = read_bundle(StringIO(stdout))
94
 
        self.assertRevisions(br, ['revision3'])
95
 
 
96
 
    def test_no_common_ancestor(self):
97
 
        foo = self.make_branch_and_tree('foo')
98
 
        bar = self.make_branch_and_tree('bar')
99
 
        os.chdir('foo')
100
 
        self.run_bzr('bundle ../bar')
 
84
        self.run_bzr('bundle', '../grandparent', '-r', '-2..-1', retcode=3)