1
=== modified file 'lib/canonical/buildd/generate_translation_templates.py'
2
--- lib/canonical/buildd/generate_translation_templates.py	2010-02-25 13:43:22 +0000
3
+++ lib/canonical/buildd/generate_translation_templates.py	2010-03-04 09:44:21 +0000
4
@@ -7,8 +7,12 @@
5
7
import os.path
7
import os.path
6
8
import sys
8
import sys
7
9
9
8
10
from bzrlib.branch import Branch
9
11
from bzrlib.export import export
10
12
11
10
from lp.translations.pottery.buildd import generate_pots
13
from lp.translations.pottery.buildd import generate_pots
12
11
14
13
15
14
12
class GenerateTranslationTemplates:
16
class GenerateTranslationTemplates:
15
13
    """Script to generate translation templates from a branch."""
17
    """Script to generate translation templates from a branch."""
16
14
18
17
@@ -39,8 +43,9 @@
18
39
        The branch is checked out to the location specified by
43
        The branch is checked out to the location specified by
19
40
        `self.branch_dir`.
44
        `self.branch_dir`.
20
41
        """
45
        """
23
42
        # XXX JeroenVermeulen 2010-02-11 bug=520651: Read the contents
46
        branch = Branch.open(branch_url)
24
43
        # of the branch using bzrlib.
47
        rev_tree = branch.basis_tree()
25
48
        export(rev_tree, self.branch_dir)
26
44
49
27
45
    def generate(self):
50
    def generate(self):
28
46
        """Do It.  Generate templates."""
51
        """Do It.  Generate templates."""
29
47
52
30
=== modified file 'lib/canonical/buildd/tests/test_generate_translation_templates.py'
31
--- lib/canonical/buildd/tests/test_generate_translation_templates.py	2010-01-22 06:07:27 +0000
32
+++ lib/canonical/buildd/tests/test_generate_translation_templates.py	2010-03-04 09:44:21 +0000
33
@@ -4,37 +4,31 @@
34
4
import os
4
import os
35
5
from unittest import TestLoader
5
from unittest import TestLoader
36
6
6
38
7
from lp.testing import TestCase
7
from lp.testing.fakemethod import FakeMethod
39
8
8
40
9
from canonical.buildd.generate_translation_templates import (
9
from canonical.buildd.generate_translation_templates import (
41
10
    GenerateTranslationTemplates)
10
    GenerateTranslationTemplates)
42
11
11
43
12
from canonical.launchpad.ftests.script import run_script
12
from canonical.launchpad.ftests.script import run_script
44
13
from canonical.testing.layers import ZopelessDatabaseLayer
13
from canonical.testing.layers import ZopelessDatabaseLayer
59
14
14
from lp.code.model.directbranchcommit import DirectBranchCommit
60
15
15
from lp.testing import TestCaseWithFactory
61
16
class MockGenerateTranslationTemplates(GenerateTranslationTemplates):
16
62
17
    """A GenerateTranslationTemplates with mocked _checkout."""
17
63
18
    # Records, for testing purposes, whether this object checked out a
18
class TestGenerateTranslationTemplates(TestCaseWithFactory):
50
19
    # branch.
51
20
    checked_out_branch = False
52
21
53
22
    def _checkout(self, branch_url):
54
23
        assert not self.checked_out_branch, "Checking out branch again!"
55
24
        self.checked_out_branch = True
56
25
57
26
58
27
class TestGenerateTranslationTemplates(TestCase):
64
28
    """Test slave-side generate-translation-templates script."""
19
    """Test slave-side generate-translation-templates script."""
65
20
    layer = ZopelessDatabaseLayer
66
21
67
29
    def test_getBranch_url(self):
22
    def test_getBranch_url(self):
68
30
        # If passed a branch URL, the template generation script will
23
        # If passed a branch URL, the template generation script will
69
31
        # check out that branch into a directory called "source-tree."
24
        # check out that branch into a directory called "source-tree."
70
32
        branch_url = 'lp://~my/translation/branch'
25
        branch_url = 'lp://~my/translation/branch'
71
33
26
73
34
        generator = MockGenerateTranslationTemplates(branch_url)
27
        generator = GenerateTranslationTemplates(branch_url)
74
28
        generator._checkout = FakeMethod()
75
35
        generator._getBranch()
29
        generator._getBranch()
76
36
30
78
37
        self.assertTrue(generator.checked_out_branch)
31
        self.assertEqual(1, generator._checkout.call_count)
79
38
        self.assertTrue(generator.branch_dir.endswith('source-tree'))
32
        self.assertTrue(generator.branch_dir.endswith('source-tree'))
80
39
33
81
40
    def test_getBranch_dir(self):
34
    def test_getBranch_dir(self):
82
@@ -42,12 +36,48 @@
83
42
        # works directly in that directory.
36
        # works directly in that directory.
84
43
        branch_dir = '/home/me/branch'
37
        branch_dir = '/home/me/branch'
85
44
38
87
45
        generator = MockGenerateTranslationTemplates(branch_dir)
39
        generator = GenerateTranslationTemplates(branch_dir)
88
40
        generator._checkout = FakeMethod()
89
46
        generator._getBranch()
41
        generator._getBranch()
90
47
42
92
48
        self.assertFalse(generator.checked_out_branch)
43
        self.assertEqual(0, generator._checkout.call_count)
93
49
        self.assertEqual(branch_dir, generator.branch_dir)
44
        self.assertEqual(branch_dir, generator.branch_dir)
94
50
45
95
46
    def _createBranch(self, content_map=None):
96
47
        """Create a working branch.
97
48
        
98
49
        :param content_map: optional dict mapping file names to file contents.
99
50
            Each of these files with their contents will be written to the
100
51
            branch.
101
52
102
53
        :return: a fresh lp.code.model.Branch backed by a real bzr branch.
103
54
        """
104
55
        db_branch, tree = self.create_branch_and_tree(hosted=True)
105
56
        populist = DirectBranchCommit(db_branch)
106
57
        last_revision = populist.bzrbranch.last_revision()
107
58
        db_branch.last_scanned_id = populist.last_scanned_id = last_revision
108
59
109
60
        if content_map is not None:
110
61
            for name, contents in content_map.iteritems():
111
62
                populist.writeFile(name, contents)
112
63
            populist.commit("Populating branch.")
113
64
114
65
        return db_branch
115
66
116
67
    def test_getBranch_bzr(self):
117
68
        # _getBranch can retrieve branch contents from a branch URL.
118
69
        self.useBzrBranches()
119
70
        marker_text = "Ceci n'est pas cet branch."
120
71
        branch = self._createBranch({'marker.txt': marker_text})
121
72
        branch_url = branch.getPullURL()
122
73
123
74
        generator = GenerateTranslationTemplates(branch_url)
124
75
        generator.branch_dir = self.makeTemporaryDirectory()
125
76
        generator._getBranch()
126
77
127
78
        marker_file = file(os.path.join(generator.branch_dir, 'marker.txt'))
128
79
        self.assertEqual(marker_text, marker_file.read())
129
80
130
51
    def test_script(self):
81
    def test_script(self):
131
52
        tempdir = self.makeTemporaryDirectory()
82
        tempdir = self.makeTemporaryDirectory()
132
53
        (retval, out, err) = run_script(
83
        (retval, out, err) = run_script(
Reviewer	Review Type	Date Requested	Status
Muharem Hrnjadovic (community)	code	2010-03-04	Approve on 2010-03-04
Review via email: mp+20632@code.launchpad.net