← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2009-07-24 18:26:21 UTC
  • mfrom: (4567 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4568.
  • Revision ID: john@arbash-meinel.com-20090724182621-68s2jhoqf3pn72n7
Merge bzr.dev 4567 to resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
255
255
        if char is None:
256
256
            raise TestSkipped('Cannot find suitable non-ascii character'
257
257
                'for user_encoding (%s)' % osutils.get_user_encoding())
 
258
        # TODO: jam 2009-07-23 This test seems to fail on Windows now. My best
 
259
        #       guess is that the change to use Unicode command lines means
 
260
        #       that we no longer pay any attention to LANG=C when decoding the
 
261
        #       commandline arguments.
258
262
        out,err = self.run_bzr_subprocess('commit -m "%s"' % char,
259
263
                                          retcode=1,
260
264
                                          env_changes={'LANG': 'C'})
639
643
        out, err = self.run_bzr("commit tree/hello.txt")
640
644
        last_rev = tree.branch.repository.get_revision(tree.last_revision())
641
645
        self.assertEqual('save me some typing\n', last_rev.message)
642
 
 
643
 
    def test_commit_and_mv_dance_a(self):
644
 
        # see https://bugs.launchpad.net/bzr/+bug/395556
645
 
        tree = self.make_branch_and_tree(".")
646
 
        self.build_tree(["a"])
647
 
        tree.add("a")
648
 
        self.check_output("a => b\n", ["mv", "a", "b"])
649
 
        self.check_output("", ["commit", "-q", "-m", "Actually no, b"])
650
 
        self.check_output("b => a\n", ["mv", "b", "a"])
651
 
        self.check_output("", ["commit", "-q", "-m", "No, really, a"])
652
 
 
653
 
    def test_commit_and_mv_dance_b(self):
654
 
        # see https://bugs.launchpad.net/bzr/+bug/395556
655
 
        tree = self.make_branch_and_tree(".")
656
 
        self.build_tree(["b"])
657
 
        tree.add("b")
658
 
        self.check_output("b => a\n", ["mv", "b", "a"])
659
 
        self.check_output("", ["commit", "-q", "-m", "Actually no, a"])
660
 
        self.check_output("a => b\n", ["mv", "a", "b"])
661
 
        self.expectFailure("bug 395556: gives DuplicateFileId "
662
 
            "committing renames",
663
 
            self.check_output, "", ["commit", "-q", "-m", "No, really, b"])