From: TANIGUCHI Takaki Date: Fri, 28 Dec 2018 16:48:45 +0900 Subject: Fix package name conflicts --- tests/test_scripts/test_pcreate.py | 106 ++++++++++++++++++------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/tests/test_scripts/test_pcreate.py b/tests/test_scripts/test_pcreate.py index 6ac082b..a1c0ac4 100644 --- a/tests/test_scripts/test_pcreate.py +++ b/tests/test_scripts/test_pcreate.py @@ -60,7 +60,7 @@ class TestPCreateCommand(unittest.TestCase): self.assertTrue(out.count('You must provide a project name')) def test_unknown_scaffold_name(self): - cmd = self._makeOne('-s', 'dummyXX', 'distro') + cmd = self._makeOne('-s', 'dummyXX', 'distro0') result = cmd.run() self.assertEqual(result, 2) out = self.out_.getvalue() @@ -69,7 +69,7 @@ class TestPCreateCommand(unittest.TestCase): def test_known_scaffold_single_rendered(self): import os - cmd = self._makeOne('-s', 'dummy', 'Distro') + cmd = self._makeOne('-s', 'dummy', 'Distro0') scaffold = DummyScaffold('dummy') cmd.scaffolds = [scaffold] cmd.pyramid_dist = DummyDist("0.1") @@ -77,14 +77,14 @@ class TestPCreateCommand(unittest.TestCase): self.assertEqual(result, 0) self.assertEqual( scaffold.output_dir, - os.path.normpath(os.path.join(os.getcwd(), 'Distro')), + os.path.normpath(os.path.join(os.getcwd(), 'Distro0')), ) self.assertEqual( scaffold.vars, { - 'project': 'Distro', - 'egg': 'Distro', - 'package': 'distro', + 'project': 'Distro0', + 'egg': 'Distro0', + 'package': 'distro0', 'pyramid_version': '0.1', 'pyramid_docs_branch': '0.1-branch', }, @@ -94,7 +94,7 @@ class TestPCreateCommand(unittest.TestCase): import os cmd = self._makeOne( - '-s', 'dummy', '--package-name', 'dummy_package', 'Distro' + '-s', 'dummy', '--package-name', 'dummy_package', 'Distro0' ) scaffold = DummyScaffold('dummy') cmd.scaffolds = [scaffold] @@ -104,12 +104,12 @@ class TestPCreateCommand(unittest.TestCase): self.assertEqual(result, 0) self.assertEqual( scaffold.output_dir, - os.path.normpath(os.path.join(os.getcwd(), 'Distro')), + os.path.normpath(os.path.join(os.getcwd(), 'Distro0')), ) self.assertEqual( scaffold.vars, { - 'project': 'Distro', + 'project': 'Distro0', 'egg': 'dummy_package', 'package': 'dummy_package', 'pyramid_version': '0.1', @@ -120,7 +120,7 @@ class TestPCreateCommand(unittest.TestCase): def test_scaffold_with_hyphen_in_project_name(self): import os - cmd = self._makeOne('-s', 'dummy', 'Distro-') + cmd = self._makeOne('-s', 'dummy', 'Distro0-') scaffold = DummyScaffold('dummy') cmd.scaffolds = [scaffold] cmd.pyramid_dist = DummyDist("0.1") @@ -128,14 +128,14 @@ class TestPCreateCommand(unittest.TestCase): self.assertEqual(result, 0) self.assertEqual( scaffold.output_dir, - os.path.normpath(os.path.join(os.getcwd(), 'Distro-')), + os.path.normpath(os.path.join(os.getcwd(), 'Distro0-')), ) self.assertEqual( scaffold.vars, { - 'project': 'Distro-', - 'egg': 'Distro_', - 'package': 'distro_', + 'project': 'Distro0-', + 'egg': 'Distro0_', + 'package': 'distro0_', 'pyramid_version': '0.1', 'pyramid_docs_branch': '0.1-branch', }, @@ -144,7 +144,7 @@ class TestPCreateCommand(unittest.TestCase): def test_known_scaffold_absolute_path(self): import os - path = os.path.abspath('Distro') + path = os.path.abspath('Distro0') cmd = self._makeOne('-s', 'dummy', path) cmd.pyramid_dist = DummyDist("0.1") scaffold = DummyScaffold('dummy') @@ -154,14 +154,14 @@ class TestPCreateCommand(unittest.TestCase): self.assertEqual(result, 0) self.assertEqual( scaffold.output_dir, - os.path.normpath(os.path.join(os.getcwd(), 'Distro')), + os.path.normpath(os.path.join(os.getcwd(), 'Distro0')), ) self.assertEqual( scaffold.vars, { - 'project': 'Distro', - 'egg': 'Distro', - 'package': 'distro', + 'project': 'Distro0', + 'egg': 'Distro0', + 'package': 'distro0', 'pyramid_version': '0.1', 'pyramid_docs_branch': '0.1-branch', }, @@ -170,7 +170,7 @@ class TestPCreateCommand(unittest.TestCase): def test_known_scaffold_multiple_rendered(self): import os - cmd = self._makeOne('-s', 'dummy1', '-s', 'dummy2', 'Distro') + cmd = self._makeOne('-s', 'dummy1', '-s', 'dummy2', 'Distro0') scaffold1 = DummyScaffold('dummy1') scaffold2 = DummyScaffold('dummy2') cmd.scaffolds = [scaffold1, scaffold2] @@ -179,28 +179,28 @@ class TestPCreateCommand(unittest.TestCase): self.assertEqual(result, 0) self.assertEqual( scaffold1.output_dir, - os.path.normpath(os.path.join(os.getcwd(), 'Distro')), + os.path.normpath(os.path.join(os.getcwd(), 'Distro0')), ) self.assertEqual( scaffold1.vars, { - 'project': 'Distro', - 'egg': 'Distro', - 'package': 'distro', + 'project': 'Distro0', + 'egg': 'Distro0', + 'package': 'distro0', 'pyramid_version': '0.1', 'pyramid_docs_branch': '0.1-branch', }, ) self.assertEqual( scaffold2.output_dir, - os.path.normpath(os.path.join(os.getcwd(), 'Distro')), + os.path.normpath(os.path.join(os.getcwd(), 'Distro0')), ) self.assertEqual( scaffold2.vars, { - 'project': 'Distro', - 'egg': 'Distro', - 'package': 'distro', + 'project': 'Distro0', + 'egg': 'Distro0', + 'package': 'distro0', 'pyramid_version': '0.1', 'pyramid_docs_branch': '0.1-branch', }, @@ -209,7 +209,7 @@ class TestPCreateCommand(unittest.TestCase): def test_known_scaffold_with_path_as_project_target_rendered(self): import os - cmd = self._makeOne('-s', 'dummy', '/tmp/foo/Distro/') + cmd = self._makeOne('-s', 'dummy', '/tmp/foo/Distro0/') scaffold = DummyScaffold('dummy') cmd.scaffolds = [scaffold] cmd.pyramid_dist = DummyDist("0.1") @@ -217,21 +217,21 @@ class TestPCreateCommand(unittest.TestCase): self.assertEqual(result, 0) self.assertEqual( scaffold.output_dir, - os.path.normpath(os.path.join(os.getcwd(), '/tmp/foo/Distro')), + os.path.normpath(os.path.join(os.getcwd(), '/tmp/foo/Distro0')), ) self.assertEqual( scaffold.vars, { - 'project': 'Distro', - 'egg': 'Distro', - 'package': 'distro', + 'project': 'Distro0', + 'egg': 'Distro0', + 'package': 'distro0', 'pyramid_version': '0.1', 'pyramid_docs_branch': '0.1-branch', }, ) def test_scaffold_with_prod_pyramid_version(self): - cmd = self._makeOne('-s', 'dummy', 'Distro') + cmd = self._makeOne('-s', 'dummy', 'Distro0') scaffold = DummyScaffold('dummy') cmd.scaffolds = [scaffold] cmd.pyramid_dist = DummyDist("0.2") @@ -240,16 +240,16 @@ class TestPCreateCommand(unittest.TestCase): self.assertEqual( scaffold.vars, { - 'project': 'Distro', - 'egg': 'Distro', - 'package': 'distro', + 'project': 'Distro0', + 'egg': 'Distro0', + 'package': 'distro0', 'pyramid_version': '0.2', 'pyramid_docs_branch': '0.2-branch', }, ) def test_scaffold_with_prod_pyramid_long_version(self): - cmd = self._makeOne('-s', 'dummy', 'Distro') + cmd = self._makeOne('-s', 'dummy', 'Distro0') scaffold = DummyScaffold('dummy') cmd.scaffolds = [scaffold] cmd.pyramid_dist = DummyDist("0.2.1") @@ -258,16 +258,16 @@ class TestPCreateCommand(unittest.TestCase): self.assertEqual( scaffold.vars, { - 'project': 'Distro', - 'egg': 'Distro', - 'package': 'distro', + 'project': 'Distro0', + 'egg': 'Distro0', + 'package': 'distro0', 'pyramid_version': '0.2.1', 'pyramid_docs_branch': '0.2-branch', }, ) def test_scaffold_with_prod_pyramid_unparsable_version(self): - cmd = self._makeOne('-s', 'dummy', 'Distro') + cmd = self._makeOne('-s', 'dummy', 'Distro0') scaffold = DummyScaffold('dummy') cmd.scaffolds = [scaffold] cmd.pyramid_dist = DummyDist("abc") @@ -276,16 +276,16 @@ class TestPCreateCommand(unittest.TestCase): self.assertEqual( scaffold.vars, { - 'project': 'Distro', - 'egg': 'Distro', - 'package': 'distro', + 'project': 'Distro0', + 'egg': 'Distro0', + 'package': 'distro0', 'pyramid_version': 'abc', 'pyramid_docs_branch': 'latest', }, ) def test_scaffold_with_dev_pyramid_version(self): - cmd = self._makeOne('-s', 'dummy', 'Distro') + cmd = self._makeOne('-s', 'dummy', 'Distro0') scaffold = DummyScaffold('dummy') cmd.scaffolds = [scaffold] cmd.pyramid_dist = DummyDist("0.12dev") @@ -294,16 +294,16 @@ class TestPCreateCommand(unittest.TestCase): self.assertEqual( scaffold.vars, { - 'project': 'Distro', - 'egg': 'Distro', - 'package': 'distro', + 'project': 'Distro0', + 'egg': 'Distro0', + 'package': 'distro0', 'pyramid_version': '0.12dev', 'pyramid_docs_branch': 'master', }, ) def test_scaffold_with_dev_pyramid_long_version(self): - cmd = self._makeOne('-s', 'dummy', 'Distro') + cmd = self._makeOne('-s', 'dummy', 'Distro0') scaffold = DummyScaffold('dummy') cmd.scaffolds = [scaffold] cmd.pyramid_dist = DummyDist("0.10.1dev") @@ -312,9 +312,9 @@ class TestPCreateCommand(unittest.TestCase): self.assertEqual( scaffold.vars, { - 'project': 'Distro', - 'egg': 'Distro', - 'package': 'distro', + 'project': 'Distro0', + 'egg': 'Distro0', + 'package': 'distro0', 'pyramid_version': '0.10.1dev', 'pyramid_docs_branch': 'master', },