← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_weave.py

  • Committer: Vincent Ladeuil
  • Date: 2016-01-21 11:42:23 UTC
  • mto: This revision was merged to the branch mainline in revision 6610.
  • Revision ID: v.ladeuil+lp@free.fr-20160121114223-ngcvndi02ydiqs5z
Allow hyphens in option names to unbreak compatibility.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_weave.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005-2009, 2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
28
28
    )
29
29
from bzrlib.osutils import sha_string
30
30
from bzrlib.tests import TestCase, TestCaseInTempDir
31
 
from bzrlib.weave import Weave, WeaveFormatError, WeaveError
 
31
from bzrlib.weave import Weave, WeaveFormatError
32
32
from bzrlib.weavefile import write_weave, read_weave
33
33
 
34
34
 
64
64
 
65
65
class WeaveContains(TestBase):
66
66
    """Weave __contains__ operator"""
 
67
 
67
68
    def runTest(self):
68
69
        k = Weave(get_scope=lambda:None)
69
70
        self.assertFalse('foo' in k)
72
73
 
73
74
 
74
75
class Easy(TestBase):
 
76
 
75
77
    def runTest(self):
76
78
        k = Weave()
77
79
 
78
80
 
79
81
class AnnotateOne(TestBase):
 
82
 
80
83
    def runTest(self):
81
84
        k = Weave()
82
85
        k.add_lines('text0', [], TEXT_0)
86
89
 
87
90
class InvalidAdd(TestBase):
88
91
    """Try to use invalid version number during add."""
 
92
 
89
93
    def runTest(self):
90
94
        k = Weave()
91
95
 
107
111
 
108
112
 
109
113
class InvalidRepeatedAdd(TestBase):
 
114
 
110
115
    def runTest(self):
111
116
        k = Weave()
112
117
        k.add_lines('basis', [], TEXT_0)
533
538
 
534
539
class Merge(TestBase):
535
540
    """Storage of versions that merge diverged parents"""
 
541
 
536
542
    def runTest(self):
537
543
        k = Weave()
538
544
 
649
655
 
650
656
 
651
657
class JoinWeavesTests(TestBase):
 
658
 
652
659
    def setUp(self):
653
660
        super(JoinWeavesTests, self).setUp()
654
661
        self.weave1 = Weave()