launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #21540
[Merge] lp:~cjwatson/launchpad/remove-lpbuildd-pottery-dependencies into lp:launchpad
Colin Watson has proposed merging lp:~cjwatson/launchpad/remove-lpbuildd-pottery-dependencies into lp:launchpad.
Commit message:
Remove pottery-generate-intltool.py script and lpbuildd.pottery tests.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/remove-lpbuildd-pottery-dependencies/+merge/323850
pottery-generate-intltool.py can't be in use in production as far as I can tell, and the lpbuildd.pottery tests belong with the code under test in launchpad-buildd (see https://code.launchpad.net/~cjwatson/launchpad-buildd/pottery-tests/+merge/323843).
--
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/remove-lpbuildd-pottery-dependencies into lp:launchpad.
=== added directory 'lib/lp/translations/pottery/tests'
=== added file 'lib/lp/translations/pottery/tests/__init__.py'
=== renamed directory 'lib/lp/translations/tests/pottery_test_data' => 'lib/lp/translations/pottery/tests/pottery_test_data'
=== renamed file 'lib/lp/translations/tests/test_pottery_detect_intltool.py' => 'lib/lp/translations/pottery/tests/test_detect_intltool.py'
--- lib/lp/translations/tests/test_pottery_detect_intltool.py 2015-10-14 16:23:18 +0000
+++ lib/lp/translations/pottery/tests/test_detect_intltool.py 2017-05-10 13:15:20 +0000
@@ -1,29 +1,19 @@
-# Copyright 2009-2010 Canonical Ltd. This software is licensed under the
+# Copyright 2009-2017 Canonical Ltd. This software is licensed under the
# GNU Affero General Public License version 3 (see the file LICENSE).
+__metaclass__ = type
+
+import errno
import os
-from StringIO import StringIO
import tarfile
-from textwrap import dedent
from bzrlib.bzrdir import BzrDir
-from lpbuildd.pottery.intltool import (
- check_potfiles_in,
- ConfigFile,
- find_intltool_dirs,
- find_potfiles_in,
- generate_pot,
- generate_pots,
- get_translation_domain,
- )
-from lp.services.scripts.tests import run_script
from lp.testing import TestCase
-from lp.testing.fakemethod import FakeMethod
from lp.translations.pottery.detect_intltool import is_intltool_structure
-class SetupTestPackageMixin(object):
+class SetupTestPackageMixin:
test_data_dir = "pottery_test_data"
@@ -42,9 +32,8 @@
self.test_data_dir, packagename + ".tar.bz2")
# Then change into the temporary directory and unpack it.
self.useTempDir()
- tar = tarfile.open(packagepath, "r|bz2")
- tar.extractall()
- tar.close()
+ with tarfile.open(packagepath, "r|bz2") as tar:
+ tar.extractall()
os.chdir(packagename)
if buildfiles is None:
@@ -58,303 +47,12 @@
os.makedirs(directory)
except OSError as e:
# Doesn't matter if it already exists.
- if e.errno != 17:
+ if e.errno != errno.EEXIST:
raise
with open(path, 'w') as the_file:
the_file.write(content)
-class TestDetectIntltool(TestCase, SetupTestPackageMixin):
-
- def test_detect_potfiles_in(self):
- # Find POTFILES.in in a package with multiple dirs when only one has
- # POTFILES.in.
- self.prepare_package("intltool_POTFILES_in_1")
- dirs = find_potfiles_in()
- self.assertContentEqual(["./po-intltool"], dirs)
-
- def test_detect_potfiles_in_module(self):
- # Find POTFILES.in in a package with POTFILES.in at different levels.
- self.prepare_package("intltool_POTFILES_in_2")
- dirs = find_potfiles_in()
- self.assertContentEqual(["./po", "./module1/po"], dirs)
-
- def test_check_potfiles_in_content_ok(self):
- # Ideally all files listed in POTFILES.in exist in the source package.
- self.prepare_package("intltool_single_ok")
- self.assertTrue(check_potfiles_in("./po"))
-
- def test_check_potfiles_in_content_ok_file_added(self):
- # If a file is not listed in POTFILES.in, the file is still good for
- # our purposes.
- self.prepare_package("intltool_single_ok")
- added_file = file("./src/sourcefile_new.c", "w")
- added_file.write("/* Test file. */")
- added_file.close()
- self.assertTrue(check_potfiles_in("./po"))
-
- def test_check_potfiles_in_content_not_ok_file_removed(self):
- # If a file is missing that is listed in POTFILES.in, the file
- # intltool structure is probably broken and cannot be used for
- # our purposes.
- self.prepare_package("intltool_single_ok")
- os.remove("./src/sourcefile1.c")
- self.assertFalse(check_potfiles_in("./po"))
-
- def test_check_potfiles_in_wrong_directory(self):
- # Passing in the wrong directory will cause the check to fail
- # gracefully and return False.
- self.prepare_package("intltool_single_ok")
- self.assertFalse(check_potfiles_in("./foo"))
-
- def test_find_intltool_dirs(self):
- # Complete run: find all directories with intltool structure.
- self.prepare_package("intltool_full_ok")
- self.assertEqual(
- ["./po-module1", "./po-module2"], find_intltool_dirs())
-
- def test_find_intltool_dirs_broken(self):
- # Complete run: part of the intltool structure is broken.
- self.prepare_package("intltool_full_ok")
- os.remove("./src/module1/sourcefile1.c")
- self.assertEqual(
- ["./po-module2"], find_intltool_dirs())
-
-
-class TestIntltoolDomain(TestCase, SetupTestPackageMixin):
-
- def test_get_translation_domain_makevars(self):
- # Find a translation domain in Makevars.
- self.prepare_package("intltool_domain_makevars")
- self.assertEqual(
- "translationdomain",
- get_translation_domain("po"))
-
- def test_get_translation_domain_makevars_subst_1(self):
- # Find a translation domain in Makevars, substituted from
- # Makefile.in.in.
- self.prepare_package(
- "intltool_domain_base",
- {
- "po/Makefile.in.in": "PACKAGE=packagename-in-in\n",
- "po/Makevars": "DOMAIN = $(PACKAGE)\n",
- })
- self.assertEqual(
- "packagename-in-in",
- get_translation_domain("po"))
-
- def test_get_translation_domain_makevars_subst_2(self):
- # Find a translation domain in Makevars, substituted from
- # configure.ac.
- self.prepare_package(
- "intltool_domain_base",
- {
- "configure.ac": "PACKAGE=packagename-ac\n",
- "po/Makefile.in.in": "# No domain here.\n",
- "po/Makevars": "DOMAIN = $(PACKAGE)\n",
- })
- self.assertEqual(
- "packagename-ac",
- get_translation_domain("po"))
-
- def test_get_translation_domain_makefile_in_in(self):
- # Find a translation domain in Makefile.in.in.
- self.prepare_package("intltool_domain_makefile_in_in")
- self.assertEqual(
- "packagename-in-in",
- get_translation_domain("po"))
-
- def test_get_translation_domain_configure_ac(self):
- # Find a translation domain in configure.ac.
- self.prepare_package("intltool_domain_configure_ac")
- self.assertEqual(
- "packagename-ac",
- get_translation_domain("po"))
-
- def prepare_ac_init(self, parameters):
- # Prepare test for various permutations of AC_INIT parameters
- configure_ac_content = dedent("""
- AC_INIT(%s)
- GETTEXT_PACKAGE=AC_PACKAGE_NAME
- """) % parameters
- self.prepare_package(
- "intltool_domain_base",
- {
- "configure.ac": configure_ac_content,
- })
-
- def test_get_translation_domain_configure_ac_init(self):
- # Find a translation domain in configure.ac in AC_INIT.
- self.prepare_ac_init("packagename-ac-init, 1.0, http://bug.org";)
- self.assertEqual(
- "packagename-ac-init",
- get_translation_domain("po"))
-
- def test_get_translation_domain_configure_ac_init_single_param(self):
- # Find a translation domain in configure.ac in AC_INIT.
- self.prepare_ac_init("[Just 1 param]")
- self.assertIs(None, get_translation_domain("po"))
-
- def test_get_translation_domain_configure_ac_init_brackets(self):
- # Find a translation domain in configure.ac in AC_INIT with brackets.
- self.prepare_ac_init("[packagename-ac-init], 1.0, http://bug.org";)
- self.assertEqual(
- "packagename-ac-init",
- get_translation_domain("po"))
-
- def test_get_translation_domain_configure_ac_init_tarname(self):
- # Find a translation domain in configure.ac in AC_INIT tar name
- # parameter.
- self.prepare_ac_init(
- "[Package name], 1.0, http://bug.org, [package-tarname]")
- self.assertEqual(
- "package-tarname",
- get_translation_domain("po"))
-
- def test_get_translation_domain_configure_ac_init_multiline(self):
- # Find a translation domain in configure.ac in AC_INIT when it
- # spans multiple lines.
- self.prepare_ac_init(
- "[packagename-ac-init],\n 1.0,\n http://bug.org";)
- self.assertEqual(
- "packagename-ac-init",
- get_translation_domain("po"))
-
- def test_get_translation_domain_configure_ac_init_multiline_tarname(self):
- # Find a translation domain in configure.ac in AC_INIT tar name
- # parameter that is on a different line.
- self.prepare_ac_init(
- "[Package name], 1.0,\n http://bug.org, [package-tarname]")
- self.assertEqual(
- "package-tarname",
- get_translation_domain("po"))
-
- def test_get_translation_domain_configure_in(self):
- # Find a translation domain in configure.in.
- self.prepare_package("intltool_domain_configure_in")
- self.assertEqual(
- "packagename-in",
- get_translation_domain("po"))
-
- def test_get_translation_domain_makefile_in_in_substitute(self):
- # Find a translation domain in Makefile.in.in with substitution from
- # configure.ac.
- self.prepare_package("intltool_domain_makefile_in_in_substitute")
- self.assertEqual(
- "domainname-ac-in-in",
- get_translation_domain("po"))
-
- def test_get_translation_domain_makefile_in_in_substitute_same_name(self):
- # Find a translation domain in Makefile.in.in with substitution from
- # configure.ac from a variable with the same name as in
- # Makefile.in.in.
- self.prepare_package(
- "intltool_domain_makefile_in_in_substitute_same_name")
- self.assertEqual(
- "packagename-ac-in-in",
- get_translation_domain("po"))
-
- def test_get_translation_domain_makefile_in_in_substitute_same_file(self):
- # Find a translation domain in Makefile.in.in with substitution from
- # the same file.
- self.prepare_package(
- "intltool_domain_makefile_in_in_substitute_same_file")
- self.assertEqual(
- "domain-in-in-in-in",
- get_translation_domain("po"))
-
- def test_get_translation_domain_makefile_in_in_substitute_broken(self):
- # Find no translation domain in Makefile.in.in when the substitution
- # cannot be fulfilled.
- self.prepare_package(
- "intltool_domain_makefile_in_in_substitute_broken")
- self.assertIs(None, get_translation_domain("po"))
-
- def test_get_translation_domain_configure_in_substitute_version(self):
- # Find a translation domain in configure.in with Makefile-style
- # substitution from the same file.
- self.prepare_package(
- "intltool_domain_configure_in_substitute_version")
- self.assertEqual(
- "domainname-in42",
- get_translation_domain("po"))
-
-
-class TestGenerateTemplates(TestCase, SetupTestPackageMixin):
-
- def test_generate_pot(self):
- # Generate a given PO template.
- self.prepare_package("intltool_full_ok")
- self.assertTrue(
- generate_pot("./po-module1", "module1"),
- "PO template generation failed.")
- expected_path = "./po-module1/module1.pot"
- self.assertTrue(
- os.access(expected_path, os.F_OK),
- "Generated PO template '%s' not found." % expected_path)
-
- def test_generate_pot_no_domain(self):
- # Generate a generic PO template.
- self.prepare_package("intltool_full_ok")
- self.assertTrue(
- generate_pot("./po-module1", None),
- "PO template generation failed.")
- expected_path = "./po-module1/messages.pot"
- self.assertTrue(
- os.access(expected_path, os.F_OK),
- "Generated PO template '%s' not found." % expected_path)
-
- def test_generate_pot_empty_domain(self):
- # Generate a generic PO template.
- self.prepare_package("intltool_full_ok")
- self.assertTrue(
- generate_pot("./po-module1", ""),
- "PO template generation failed.")
- expected_path = "./po-module1/messages.pot"
- self.assertTrue(
- os.access(expected_path, os.F_OK),
- "Generated PO template '%s' not found." % expected_path)
-
- def test_generate_pot_not_intltool(self):
- # Fail when not an intltool setup.
- self.prepare_package("intltool_full_ok")
- # Cripple the setup.
- os.remove("./po-module1/POTFILES.in")
- self.assertFalse(
- generate_pot("./po-module1", "nothing"),
- "PO template generation should have failed.")
- not_expected_path = "./po-module1/nothing.pot"
- self.assertFalse(
- os.access(not_expected_path, os.F_OK),
- "Not expected PO template '%s' generated." % not_expected_path)
-
- def test_generate_pots(self):
- # Generate all PO templates in the package.
- self.prepare_package("intltool_full_ok")
- expected_paths = [
- './po-module1/packagename-module1.pot',
- './po-module2/packagename-module2.pot',
- ]
- pots_list = generate_pots()
- self.assertEqual(expected_paths, pots_list)
- for expected_path in expected_paths:
- self.assertTrue(
- os.access(expected_path, os.F_OK),
- "Generated PO template '%s' not found." % expected_path)
-
- def test_pottery_generate_intltool_script(self):
- # Let the script run to see it works fine.
- self.prepare_package("intltool_full_ok")
-
- return_code, stdout, stderr = run_script(
- 'scripts/rosetta/pottery-generate-intltool.py', [])
-
- self.assertEqual(dedent("""\
- ./po-module1/packagename-module1.pot
- ./po-module2/packagename-module2.pot
- """), stdout)
-
-
class TestDetectIntltoolInBzrTree(TestCase, SetupTestPackageMixin):
def prepare_tree(self):
@@ -378,167 +76,3 @@
self.prepare_package("intltool_POTFILES_in_2")
tree = self.prepare_tree()
self.assertTrue(is_intltool_structure(tree))
-
-
-class TestConfigFile(TestCase):
-
- def _makeConfigFile(self, text):
- """Create a `ConfigFile` containing `text`."""
- return ConfigFile(StringIO(dedent(text)))
-
- def test_getVariable_smoke(self):
- configfile = self._makeConfigFile("""
- A = 1
- B = 2
- C = 3
- """)
- self.assertEqual('1', configfile.getVariable('A'))
- self.assertEqual('2', configfile.getVariable('B'))
- self.assertEqual('3', configfile.getVariable('C'))
-
- def test_getVariable_exists(self):
- configfile = self._makeConfigFile("DDD=dd.d")
- self.assertEqual('dd.d', configfile.getVariable('DDD'))
-
- def test_getVariable_ignores_mere_mention(self):
- configfile = self._makeConfigFile("""
- CCC
- CCC = ccc # (this is the real definition)
- CCC
- """)
- self.assertEqual('ccc', configfile.getVariable('CCC'))
-
- def test_getVariable_ignores_irrelevancies(self):
- configfile = self._makeConfigFile("""
- A = a
- ===
- blah
- FOO(n, m)
- a = case-insensitive
-
- Z = z
- """)
- self.assertEqual('a', configfile.getVariable('A'))
- self.assertEqual('z', configfile.getVariable('Z'))
-
- def test_getVariable_exists_spaces_comment(self):
- configfile = self._makeConfigFile("CCC = ccc # comment")
- self.assertEqual('ccc', configfile.getVariable('CCC'))
-
- def test_getVariable_empty(self):
- configfile = self._makeConfigFile("AAA=")
- self.assertEqual('', configfile.getVariable('AAA'))
-
- def test_getVariable_empty_spaces(self):
- configfile = self._makeConfigFile("BBB = ")
- self.assertEqual('', configfile.getVariable('BBB'))
-
- def test_getVariable_nonexistent(self):
- configfile = self._makeConfigFile("X = y")
- self.assertIs(None, configfile.getVariable('FFF'))
-
- def test_getVariable_broken(self):
- configfile = self._makeConfigFile("EEE \n= eee")
- self.assertIs(None, configfile.getVariable('EEE'))
-
- def test_getVariable_strips_quotes(self):
- # Quotes get stripped off variables.
- configfile = self._makeConfigFile("QQQ = 'qqq'")
- self.assertEqual('qqq', configfile.getVariable('QQQ'))
-
- # This is done by invoking _stripQuotes (tested separately).
- configfile._stripQuotes = FakeMethod(result='foo')
- self.assertEqual('foo', configfile.getVariable('QQQ'))
- self.assertNotEqual(0, configfile._stripQuotes.call_count)
-
- def test_getFunctionParams_single(self):
- configfile = self._makeConfigFile("FUNC_1(param1)")
- self.assertEqual(['param1'], configfile.getFunctionParams('FUNC_1'))
-
- def test_getFunctionParams_multiple(self):
- configfile = self._makeConfigFile("FUNC_2(param1, param2, param3 )")
- self.assertEqual(
- ['param1', 'param2', 'param3'],
- configfile.getFunctionParams('FUNC_2'))
-
- def test_getFunctionParams_multiline_indented(self):
- configfile = self._makeConfigFile("""
- ML_FUNC_1(param1,
- param2, param3)
- """)
- self.assertEqual(
- ['param1', 'param2', 'param3'],
- configfile.getFunctionParams('ML_FUNC_1'))
-
- def test_getFunctionParams_multiline_not_indented(self):
- configfile = self._makeConfigFile("""
- ML_FUNC_2(
- param1,
- param2)
- """)
- self.assertEqual(
- ['param1', 'param2'], configfile.getFunctionParams('ML_FUNC_2'))
-
- def test_getFunctionParams_strips_quotes(self):
- # Quotes get stripped off function parameters.
- configfile = self._makeConfigFile('FUNC("param")')
- self.assertEqual(['param'], configfile.getFunctionParams('FUNC'))
-
- # This is done by invoking _stripQuotes (tested separately).
- configfile._stripQuotes = FakeMethod(result='arg')
- self.assertEqual(['arg'], configfile.getFunctionParams('FUNC'))
- self.assertNotEqual(0, configfile._stripQuotes.call_count)
-
- def test_stripQuotes_unquoted(self):
- # _stripQuotes leaves unquoted identifiers intact.
- configfile = self._makeConfigFile('')
- self.assertEqual('hello', configfile._stripQuotes('hello'))
-
- def test_stripQuotes_empty(self):
- configfile = self._makeConfigFile('')
- self.assertEqual('', configfile._stripQuotes(''))
-
- def test_stripQuotes_single_quotes(self):
- # Single quotes are stripped.
- configfile = self._makeConfigFile('')
- self.assertEqual('x', configfile._stripQuotes("'x'"))
-
- def test_stripQuotes_double_quotes(self):
- # Double quotes are stripped.
- configfile = self._makeConfigFile('')
- self.assertEqual('y', configfile._stripQuotes('"y"'))
-
- def test_stripQuotes_bracket_quotes(self):
- # Brackets are stripped.
- configfile = self._makeConfigFile('')
- self.assertEqual('z', configfile._stripQuotes('[z]'))
-
- def test_stripQuotes_opening_brackets(self):
- # An opening bracket must be matched by a closing one.
- configfile = self._makeConfigFile('')
- self.assertEqual('[x[', configfile._stripQuotes('[x['))
-
- def test_stripQuotes_closing_brackets(self):
- # A closing bracket is not accepted as an opening quote.
- configfile = self._makeConfigFile('')
- self.assertEqual(']x]', configfile._stripQuotes(']x]'))
-
- def test_stripQuotes_multiple(self):
- # Only a single layer of quotes is stripped.
- configfile = self._makeConfigFile('')
- self.assertEqual('"n"', configfile._stripQuotes("'\"n\"'"))
-
- def test_stripQuotes_single_quote(self):
- # A string consisting of just one quote is not stripped.
- configfile = self._makeConfigFile('')
- self.assertEqual("'", configfile._stripQuotes("'"))
-
- def test_stripQuotes_mismatched(self):
- # Mismatched quotes are not stripped.
- configfile = self._makeConfigFile('')
- self.assertEqual("'foo\"", configfile._stripQuotes("'foo\""))
-
- def test_stripQuotes_unilateral(self):
- # A quote that's only on one end doesn't get stripped.
- configfile = self._makeConfigFile('')
- self.assertEqual('"foo', configfile._stripQuotes('"foo'))
=== removed file 'lib/lp/translations/tests/pottery_test_data/intltool_domain_base.tar.bz2'
Binary files lib/lp/translations/tests/pottery_test_data/intltool_domain_base.tar.bz2 2010-05-03 16:54:28 +0000 and lib/lp/translations/tests/pottery_test_data/intltool_domain_base.tar.bz2 1970-01-01 00:00:00 +0000 differ
=== removed file 'lib/lp/translations/tests/pottery_test_data/intltool_domain_configure_ac.tar.bz2'
Binary files lib/lp/translations/tests/pottery_test_data/intltool_domain_configure_ac.tar.bz2 2010-04-30 09:10:08 +0000 and lib/lp/translations/tests/pottery_test_data/intltool_domain_configure_ac.tar.bz2 1970-01-01 00:00:00 +0000 differ
=== removed file 'lib/lp/translations/tests/pottery_test_data/intltool_domain_configure_in.tar.bz2'
Binary files lib/lp/translations/tests/pottery_test_data/intltool_domain_configure_in.tar.bz2 2010-04-30 09:10:08 +0000 and lib/lp/translations/tests/pottery_test_data/intltool_domain_configure_in.tar.bz2 1970-01-01 00:00:00 +0000 differ
=== removed file 'lib/lp/translations/tests/pottery_test_data/intltool_domain_configure_in_substitute_version.tar.bz2'
Binary files lib/lp/translations/tests/pottery_test_data/intltool_domain_configure_in_substitute_version.tar.bz2 2010-04-30 09:10:08 +0000 and lib/lp/translations/tests/pottery_test_data/intltool_domain_configure_in_substitute_version.tar.bz2 1970-01-01 00:00:00 +0000 differ
=== removed file 'lib/lp/translations/tests/pottery_test_data/intltool_domain_makefile_in_in.tar.bz2'
Binary files lib/lp/translations/tests/pottery_test_data/intltool_domain_makefile_in_in.tar.bz2 2010-04-30 09:10:08 +0000 and lib/lp/translations/tests/pottery_test_data/intltool_domain_makefile_in_in.tar.bz2 1970-01-01 00:00:00 +0000 differ
=== removed file 'lib/lp/translations/tests/pottery_test_data/intltool_domain_makefile_in_in_substitute.tar.bz2'
Binary files lib/lp/translations/tests/pottery_test_data/intltool_domain_makefile_in_in_substitute.tar.bz2 2010-04-30 09:10:08 +0000 and lib/lp/translations/tests/pottery_test_data/intltool_domain_makefile_in_in_substitute.tar.bz2 1970-01-01 00:00:00 +0000 differ
=== removed file 'lib/lp/translations/tests/pottery_test_data/intltool_domain_makefile_in_in_substitute_broken.tar.bz2'
Binary files lib/lp/translations/tests/pottery_test_data/intltool_domain_makefile_in_in_substitute_broken.tar.bz2 2010-04-30 09:10:08 +0000 and lib/lp/translations/tests/pottery_test_data/intltool_domain_makefile_in_in_substitute_broken.tar.bz2 1970-01-01 00:00:00 +0000 differ
=== removed file 'lib/lp/translations/tests/pottery_test_data/intltool_domain_makefile_in_in_substitute_same_file.tar.bz2'
Binary files lib/lp/translations/tests/pottery_test_data/intltool_domain_makefile_in_in_substitute_same_file.tar.bz2 2010-04-30 09:10:08 +0000 and lib/lp/translations/tests/pottery_test_data/intltool_domain_makefile_in_in_substitute_same_file.tar.bz2 1970-01-01 00:00:00 +0000 differ
=== removed file 'lib/lp/translations/tests/pottery_test_data/intltool_domain_makefile_in_in_substitute_same_name.tar.bz2'
Binary files lib/lp/translations/tests/pottery_test_data/intltool_domain_makefile_in_in_substitute_same_name.tar.bz2 2010-04-30 09:10:08 +0000 and lib/lp/translations/tests/pottery_test_data/intltool_domain_makefile_in_in_substitute_same_name.tar.bz2 1970-01-01 00:00:00 +0000 differ
=== removed file 'lib/lp/translations/tests/pottery_test_data/intltool_domain_makevars.tar.bz2'
Binary files lib/lp/translations/tests/pottery_test_data/intltool_domain_makevars.tar.bz2 2010-04-30 09:10:08 +0000 and lib/lp/translations/tests/pottery_test_data/intltool_domain_makevars.tar.bz2 1970-01-01 00:00:00 +0000 differ
=== removed file 'lib/lp/translations/tests/pottery_test_data/intltool_full_ok.tar.bz2'
Binary files lib/lp/translations/tests/pottery_test_data/intltool_full_ok.tar.bz2 2010-04-30 09:10:08 +0000 and lib/lp/translations/tests/pottery_test_data/intltool_full_ok.tar.bz2 1970-01-01 00:00:00 +0000 differ
=== removed file 'lib/lp/translations/tests/pottery_test_data/intltool_single_ok.tar.bz2'
Binary files lib/lp/translations/tests/pottery_test_data/intltool_single_ok.tar.bz2 2010-04-30 09:10:08 +0000 and lib/lp/translations/tests/pottery_test_data/intltool_single_ok.tar.bz2 1970-01-01 00:00:00 +0000 differ
=== removed file 'lib/lp/translations/tests/test_generate_translation_templates.py'
--- lib/lp/translations/tests/test_generate_translation_templates.py 2015-10-14 16:23:18 +0000
+++ lib/lp/translations/tests/test_generate_translation_templates.py 1970-01-01 00:00:00 +0000
@@ -1,119 +0,0 @@
-# Copyright 2010 Canonical Ltd. This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-import os
-from StringIO import StringIO
-import tarfile
-
-from lpbuildd import pottery
-from lpbuildd.pottery.generate_translation_templates import (
- GenerateTranslationTemplates,
- )
-
-from lp.code.model.directbranchcommit import DirectBranchCommit
-from lp.testing import TestCaseWithFactory
-from lp.testing.fakemethod import FakeMethod
-from lp.testing.layers import ZopelessDatabaseLayer
-from lp.testing.script import run_script
-
-
-class TestGenerateTranslationTemplates(TestCaseWithFactory):
- """Test slave-side generate-translation-templates script."""
- layer = ZopelessDatabaseLayer
-
- result_name = "translation-templates.tar.gz"
-
- def test_getBranch_url(self):
- # If passed a branch URL, the template generation script will
- # check out that branch into a directory called "source-tree."
- branch_url = 'lp://~my/translation/branch'
-
- generator = GenerateTranslationTemplates(
- branch_url, self.result_name, self.makeTemporaryDirectory(),
- log_file=StringIO())
- generator._checkout = FakeMethod()
- generator._getBranch()
-
- self.assertEqual(1, generator._checkout.call_count)
- self.assertTrue(generator.branch_dir.endswith('source-tree'))
-
- def test_getBranch_dir(self):
- # If passed a branch directory, the template generation script
- # works directly in that directory.
- branch_dir = '/home/me/branch'
-
- generator = GenerateTranslationTemplates(
- branch_dir, self.result_name, self.makeTemporaryDirectory(),
- log_file=StringIO())
- generator._checkout = FakeMethod()
- generator._getBranch()
-
- self.assertEqual(0, generator._checkout.call_count)
- self.assertEqual(branch_dir, generator.branch_dir)
-
- def _createBranch(self, content_map=None):
- """Create a working branch.
-
- :param content_map: optional dict mapping file names to file contents.
- Each of these files with their contents will be written to the
- branch.
-
- :return: a fresh lp.code.model.Branch backed by a real bzr branch.
- """
- db_branch, tree = self.create_branch_and_tree()
- populist = DirectBranchCommit(db_branch)
- last_revision = populist.bzrbranch.last_revision()
- db_branch.last_scanned_id = populist.last_scanned_id = last_revision
-
- if content_map is not None:
- for name, contents in content_map.iteritems():
- populist.writeFile(name, contents)
- populist.commit("Populating branch.")
-
- return db_branch
-
- def test_getBranch_bzr(self):
- # _getBranch can retrieve branch contents from a branch URL.
- self.useBzrBranches(direct_database=True)
- marker_text = "Ceci n'est pas cet branch."
- branch = self._createBranch({'marker.txt': marker_text})
-
- generator = GenerateTranslationTemplates(
- branch.getInternalBzrUrl(), self.result_name,
- self.makeTemporaryDirectory(), log_file=StringIO())
- generator.branch_dir = self.makeTemporaryDirectory()
- generator._getBranch()
-
- marker_file = file(os.path.join(generator.branch_dir, 'marker.txt'))
- self.assertEqual(marker_text, marker_file.read())
-
- def test_templates_tarball(self):
- # Create a tarball from pot files.
- workdir = self.makeTemporaryDirectory()
- branchdir = os.path.join(workdir, 'branchdir')
- dummy_tar = os.path.join(
- os.path.dirname(__file__), 'dummy_templates.tar.gz')
- tar = tarfile.open(dummy_tar, 'r|*')
- tar.extractall(branchdir)
- potnames = [
- member.name for member in tar.getmembers() if not member.isdir()]
- tar.close()
-
- generator = GenerateTranslationTemplates(
- branchdir, self.result_name, workdir, log_file=StringIO())
- generator._getBranch()
- generator._makeTarball(potnames)
- tar = tarfile.open(os.path.join(workdir, self.result_name), 'r|*')
- tarnames = tar.getnames()
- tar.close()
- self.assertContentEqual(potnames, tarnames)
-
- def test_script(self):
- tempdir = self.makeTemporaryDirectory()
- workdir = self.makeTemporaryDirectory()
- (retval, out, err) = run_script(
- os.path.join(
- os.path.dirname(pottery.__file__),
- 'generate_translation_templates.py'),
- args=[tempdir, self.result_name, workdir])
- self.assertEqual(0, retval)
=== removed file 'scripts/rosetta/pottery-generate-intltool.py'
--- scripts/rosetta/pottery-generate-intltool.py 2012-01-01 03:13:08 +0000
+++ scripts/rosetta/pottery-generate-intltool.py 1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/usr/bin/python -S
-#
-# Copyright 2009 Canonical Ltd. This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Print a list of directories that contain a valid intltool structure."""
-
-import _pythonpath
-
-from lpbuildd.pottery.intltool import generate_pots
-
-
-if __name__ == "__main__":
- print "\n".join(generate_pots())
Follow ups
