← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_deprecated_graph.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-10 15:46:03 UTC
  • mfrom: (4985.3.21 update)
  • mto: This revision was merged to the branch mainline in revision 5021.
  • Revision ID: v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
https://launchpad.net/bugs/113809
Update performs two merges in a more logical order but stop on conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_deprecated_graph.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
from bzrlib.tests import TestCase
18
18
from bzrlib.deprecated_graph import node_distances, nodes_by_distance, Graph
45
45
                    descendants[ancestor] = set()
46
46
                descendants[ancestor].add(node)
47
47
        return descendants
48
 
    
 
48
 
49
49
    def test_distances(self):
50
50
        descendants = self.node_descendants()
51
51
        distances = node_distances(self.graph, descendants, 'A')
69
69
class TestGraph(TestCase):
70
70
 
71
71
    def test_get_descendants(self):
72
 
        # Graph objects let you get a descendants graph in 
 
72
        # Graph objects let you get a descendants graph in
73
73
        # node: {direct-children:distance} which contains
74
74
        # known children, including ghost children
75
75
        graph = Graph()