[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/server/tests/test_mkzopeinstance.py Merged from 3.2 branch:

[Jim Fulton]

Log message for revision 41019:
  Merged from 3.2 branch:
  
  ------------------------------------------------------------------------
    r40838 | jim | 2005-12-16 17:47:40 -0500 (Fri, 16 Dec 2005) | 2 lines
  
  Fixed some bad tests.
  

Changed:
  U   Zope3/trunk/src/zope/app/server/tests/test_mkzopeinstance.py

-=-
Modified: Zope3/trunk/src/zope/app/server/tests/test_mkzopeinstance.py
===================================================================
--- Zope3/trunk/src/zope/app/server/tests/test_mkzopeinstance.py	2005-12-24 16:37:17 UTC (rev 41018)
+++ Zope3/trunk/src/zope/app/server/tests/test_mkzopeinstance.py	2005-12-24 16:38:57 UTC (rev 41019)
@@ -189,7 +189,6 @@
         self.failUnless(app.all_input_consumed())
 
     def test_zserver_support(self):
-
         # test the zserver option.  We should get zserver versions of
         # runzope, zopectl, debugzope and zope.conf.  Any of these
         # that we provide in put skeleton should be overritten.
@@ -203,15 +202,17 @@
         options = self.createOptions()
         options.destination = self.instance
         options.interactive = False
+        options.zserver = True
         app = ControlledInputApplication(options, [])
         self.assertEqual(app.process(), 0)
-
-        self.assert_('from zope.app.server.main import main' in
-                     open(os.path.join(self.instance, 'bin', 'runzope'))
-                     )
-        self.assert_('from zope.app.server.main import debug' in
-                     open(os.path.join(self.instance, 'bin', 'debugzope'))
-                     )
+        self.assert_(
+            'from zope.app.server.main import main' in
+            open(os.path.join(self.instance, 'bin', 'runzope')).read()
+            )
+        self.assert_(
+            'from zope.app.server.main import debug' in
+            open(os.path.join(self.instance, 'bin', 'debugzope')).read()
+            )
         self.assert_(os.path.exists(
             os.path.join(self.instance, 'etc', 'zope.conf')
             ))
@@ -378,6 +379,7 @@
     version = "[test-version]"
     program = "[test-program]"
     add_package_includes = False
+    zserver = False
 
 
 def test_suite():