← Back to branch summary

~didrocks/ubuntuone-client/dont-suffer-zg-crash

« back to all changes in this revision

Viewing changes to tests/u1sync/test_merge.py

  • Committer: Bazaar Package Importer
  • Author(s): Rodney Dawes
  • Date: 2011-02-11 16:18:11 UTC
  • mfrom: (1.1.44 upstream)
  • Revision ID: james.westby@ubuntu.com-20110211161811-lbelxu332e8r2dov
Tags: 1.5.4-0ubuntu1
https://launchpad.net/bugs/682878
https://launchpad.net/bugs/708335
https://launchpad.net/bugs/712674
https://launchpad.net/bugs/715776
https://launchpad.net/bugs/702055
https://launchpad.net/bugs/702075
https://launchpad.net/bugs/702128
https://launchpad.net/bugs/702138
https://launchpad.net/bugs/702144
* New upstream release.
  - Files still get downloaded from unsubscribed folder (LP: #682878)
  - Add subscription capabilities to shares (LP: #708335)
  - Nautilus offers Publish option within other's shares (LP: #712674)
  - Shares dir name may not be unique (LP: #715776)
  - Send a notification when new Volume is available (LP: #702055)
  - Add messaging menu entry for new Volumes (LP: #702075)
  - Aggregate notifications for completed operations (LP: #702128)
  - Send a notification for new Share offers (LP: #702138)
  - Add messaging menu entry for new Share offers (LP: #702144)
* Remove ubuntuone-client-tools as u1sync has been moved out.
* Simplify python package as we don't have multiple python packages now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/u1sync/test_merge.py
1
 
#
2
 
# Author: Tim Cole <tim.cole@canonical.com>
3
 
#
4
 
# Copyright 2009 Canonical Ltd.
5
 
#
6
 
# This program is free software: you can redistribute it and/or modify it
7
 
# under the terms of the GNU General Public License version 3, as published
8
 
# by the Free Software Foundation.
9
 
#
10
 
# This program is distributed in the hope that it will be useful, but
11
 
# WITHOUT ANY WARRANTY; without even the implied warranties of
12
 
# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
13
 
# PURPOSE.  See the GNU General Public License for more details.
14
 
#
15
 
# You should have received a copy of the GNU General Public License along
16
 
# with this program.  If not, see <http://www.gnu.org/licenses/>.
17
 
"""Tests for tree merging."""
18
 
 
19
 
import os
20
 
 
21
 
from unittest import TestCase
22
 
from ubuntuone.u1sync.genericmerge import MergeNode, generic_merge
23
 
from ubuntuone.u1sync.merge import (
24
 
    merge_trees, ClobberLocalMerge, ClobberServerMerge, SyncMerge)
25
 
from ubuntuone.storageprotocol.dircontent_pb2 import FILE, DIRECTORY
26
 
import uuid
27
 
 
28
 
def accumulate_path(nodes, name, partial_parent):
29
 
    """pre-merge which accumulates a path"""
30
 
    return os.path.join(partial_parent, name)   
31
 
 
32
 
def capture_merge(nodes, partial_result, child_results):
33
 
    """post-merge which accumulates merge results."""
34
 
    return (nodes, partial_result, child_results)
35
 
 
36
 
 
37
 
class MergeTest(TestCase):
38
 
    """Tests for generic tree merges."""
39
 
 
40
 
    def test_generic_merge(self):
41
 
        """Tests that generic merge behaves as expected."""
42
 
        tree_a = MergeNode(DIRECTORY, children={
43
 
            'foo': MergeNode(FILE, uuid=uuid.uuid4()),
44
 
            'bar': MergeNode(FILE, uuid=uuid.uuid4()),
45
 
        }, uuid=uuid.uuid4())
46
 
        tree_b = MergeNode(DIRECTORY, children={
47
 
            'bar': MergeNode(FILE, uuid=uuid.uuid4()),
48
 
            'baz': MergeNode(FILE, uuid=uuid.uuid4()),
49
 
        }, uuid=uuid.uuid4())
50
 
        result = generic_merge(trees=[tree_a, tree_b],
51
 
                               pre_merge=accumulate_path,
52
 
                               post_merge=capture_merge,
53
 
                               partial_parent="", name="ex")
54
 
        expected_result = ([tree_a, tree_b], "ex", {
55
 
            'foo': ([tree_a.children['foo'], None], "ex/foo", {}),
56
 
            'bar': ([tree_a.children['bar'], tree_b.children['bar']],
57
 
                    "ex/bar", {}),
58
 
            'baz': ([None, tree_b.children['baz']], "ex/baz", {}),
59
 
        })
60
 
        self.assertEqual(expected_result, result)
61
 
 
62
 
    def test_clobber(self):
63
 
        """Tests clobbering merges."""
64
 
        server_tree = MergeNode(DIRECTORY, children={
65
 
            'foo': MergeNode(FILE, content_hash="dummy:abc"),
66
 
            'bar': MergeNode(FILE, content_hash="dummy:xyz"),
67
 
            'baz': MergeNode(FILE, content_hash="dummy:aaa"),
68
 
        })
69
 
        local_tree = MergeNode(DIRECTORY, children={
70
 
            'foo': MergeNode(FILE, content_hash="dummy:cde"),
71
 
            'bar': MergeNode(FILE, content_hash="dummy:zyx"),
72
 
            'hoge': MergeNode(FILE, content_hash="dummy:bbb"),
73
 
        })
74
 
        result_tree = merge_trees(local_tree, local_tree,
75
 
                                  server_tree, server_tree,
76
 
                                  ClobberServerMerge())
77
 
        self.assertEqual(local_tree, result_tree)
78
 
        result_tree = merge_trees(local_tree, local_tree,
79
 
                                  server_tree, server_tree,
80
 
                                  ClobberLocalMerge())
81
 
        self.assertEqual(server_tree, result_tree)
82
 
 
83
 
    def test_sync(self):
84
 
        """Test sync merges."""
85
 
        server_tree = MergeNode(DIRECTORY, children={
86
 
            'bar': MergeNode(FILE, content_hash="dummy:xyz"),
87
 
            'baz': MergeNode(FILE, content_hash="dummy:aaa"),
88
 
            'foo': MergeNode(FILE, content_hash="dummy:abc"),
89
 
        })
90
 
        old_server_tree = MergeNode(DIRECTORY, children={})
91
 
        local_tree = MergeNode(DIRECTORY, children={
92
 
            'bar': MergeNode(FILE, content_hash="dummy:xyz"),
93
 
            'foo': MergeNode(FILE, content_hash="dummy:abc"),
94
 
            'hoge': MergeNode(FILE, content_hash="dummy:bbb"),
95
 
        })
96
 
        old_local_tree = MergeNode(DIRECTORY, children={})
97
 
        expected_tree = MergeNode(DIRECTORY, children={
98
 
            'bar': MergeNode(FILE, content_hash="dummy:xyz"),
99
 
            'baz': MergeNode(FILE, content_hash="dummy:aaa"),
100
 
            'foo': MergeNode(FILE, content_hash="dummy:abc"),
101
 
            'hoge': MergeNode(FILE, content_hash="dummy:bbb"),
102
 
        })
103
 
        result_tree = merge_trees(old_local_tree, local_tree,
104
 
                                  old_server_tree, server_tree,
105
 
                                  SyncMerge())
106
 
        self.assertEqual(result_tree, expected_tree)