From fe219cdea55e40782c2ee8f825812530b4018ca4 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Thu, 6 Oct 2011 05:22:14 -0400
Subject: add tests for scaffold init stuff

---
 pyramid/scaffolds/__init__.py             |  9 +++------
 pyramid/tests/test_scaffolds/test_init.py | 21 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 pyramid/tests/test_scaffolds/test_init.py

diff --git a/pyramid/scaffolds/__init__.py b/pyramid/scaffolds/__init__.py
index 93a5db12a..a42e18ab7 100644
--- a/pyramid/scaffolds/__init__.py
+++ b/pyramid/scaffolds/__init__.py
@@ -1,10 +1,7 @@
 import binascii
 import os
 
-from pyramid.compat import (
-    print_,
-    native_
-    )
+from pyramid.compat import native_
 
 from pyramid.scaffolds.template import Template
 
@@ -18,12 +15,12 @@ class PyramidTemplate(Template):
         vars['package_logger'] = package_logger
         return Template.pre(self, command, output_dir, vars)
 
-    def post(self, command, output_dir, vars):
+    def post(self, command, output_dir, vars): # pragma: no cover
         self.out('Welcome to Pyramid.  Sorry for the convenience.')
         return Template.post(self, command, output_dir, vars)
 
     def out(self, msg): # pragma: no cover (replaceable testing hook)
-        print_(msg)
+        print(msg)
 
 class StarterProjectTemplate(PyramidTemplate):
     _template_dir = 'starter'
diff --git a/pyramid/tests/test_scaffolds/test_init.py b/pyramid/tests/test_scaffolds/test_init.py
new file mode 100644
index 000000000..6b038914a
--- /dev/null
+++ b/pyramid/tests/test_scaffolds/test_init.py
@@ -0,0 +1,21 @@
+import unittest
+
+class TestPyramidTemplate(unittest.TestCase):
+    def _makeOne(self):
+        from pyramid.scaffolds import PyramidTemplate
+        return PyramidTemplate('name')
+
+    def test_pre(self):
+        inst = self._makeOne()
+        vars = {'package':'one'}
+        inst.pre('command', 'output dir', vars)
+        self.assertTrue(vars['random_string'])
+        self.assertEqual(vars['package_logger'], 'one')
+        
+    def test_pre_root(self):
+        inst = self._makeOne()
+        vars = {'package':'root'}
+        inst.pre('command', 'output dir', vars)
+        self.assertTrue(vars['random_string'])
+        self.assertEqual(vars['package_logger'], 'app')
+
-- 
cgit v1.2.3