diff options
| author | Chris McDonough <chrism@plope.com> | 2011-11-07 18:24:12 -0800 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-11-07 18:24:12 -0800 |
| commit | 2da8c01bb965188f497c9f3a5dde1287b8c7056b (patch) | |
| tree | c2387a823ea1406582dc77ca6b35cf6d4bab4cae | |
| parent | eb6298ca370ee5fcf390e85769f928a85f7060e8 (diff) | |
| parent | eb7fc0fb218a610621d76a8d9b804d1b708f918e (diff) | |
| download | pyramid-2da8c01bb965188f497c9f3a5dde1287b8c7056b.tar.gz pyramid-2da8c01bb965188f497c9f3a5dde1287b8c7056b.tar.bz2 pyramid-2da8c01bb965188f497c9f3a5dde1287b8c7056b.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | CONTRIBUTORS.txt | 2 | ||||
| -rw-r--r-- | pyramid/tests/test_scripts/test_pcreate.py | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index e1af0aab1..2654801c3 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -154,3 +154,5 @@ Contributors - Chris Shenton, 2011/11/07 - Ken Manheimer, 2011/11/07 + +- Reed O'Brien, 2011/11/07 diff --git a/pyramid/tests/test_scripts/test_pcreate.py b/pyramid/tests/test_scripts/test_pcreate.py index cdd0daf2e..363808a1e 100644 --- a/pyramid/tests/test_scripts/test_pcreate.py +++ b/pyramid/tests/test_scripts/test_pcreate.py @@ -71,6 +71,22 @@ class TestPCreateCommand(unittest.TestCase): scaffold.vars, {'project': 'Distro', 'egg': 'Distro', 'package': 'distro'}) + def test_known_scaffold_absolute_path(self): + import os + path = os.path.abspath('Distro') + cmd = self._makeOne('-s', 'dummy', path) + scaffold = DummyScaffold('dummy') + cmd.scaffolds = [scaffold] + result = cmd.run() + self.assertEqual(result, True) + self.assertEqual( + scaffold.output_dir, + os.path.normpath(os.path.join(os.getcwd(), 'Distro')) + ) + self.assertEqual( + scaffold.vars, + {'project': 'Distro', 'egg': 'Distro', 'package': 'distro'}) + def test_known_scaffold_multiple_rendered(self): import os cmd = self._makeOne('-s', 'dummy1', '-s', 'dummy2', 'Distro') |