[Checkins] SVN: zope.app.appsetup/trunk/src/zope/app/appsetup/ Make sure the branch that execfiles os.getenv('PYTHONSTARTUP') is tested.

[Marius Gedminas]

Log message for revision 90249:
  Make sure the branch that execfiles os.getenv('PYTHONSTARTUP') is tested.
  
  

Changed:
  U   zope.app.appsetup/trunk/src/zope/app/appsetup/debug.txt
  A   zope.app.appsetup/trunk/src/zope/app/appsetup/testdata/pythonstartup
  U   zope.app.appsetup/trunk/src/zope/app/appsetup/tests.py

-=-
Modified: zope.app.appsetup/trunk/src/zope/app/appsetup/debug.txt
===================================================================
--- zope.app.appsetup/trunk/src/zope/app/appsetup/debug.txt	2008-08-25 22:36:31 UTC (rev 90248)
+++ zope.app.appsetup/trunk/src/zope/app/appsetup/debug.txt	2008-08-25 22:40:26 UTC (rev 90249)
@@ -45,4 +45,17 @@
     >>> os.environ.get('PYTHONINSPECT')
     'true'
 
+We have to do extra work to honor the PYTHONSTARTUP environment variable:
 
+    >>> pythonstartup = os.path.join(os.path.dirname(debug.__file__),
+    ...                              'testdata', 'pythonstartup')
+    >>> os.environ['PYTHONSTARTUP'] = pythonstartup
+    >>> run('-C', 'test.conf')
+    The application root is known as `root`.
+
+You can see that our pythonstartup file was executed because it changed
+the prompt
+
+    >>> sys.ps1
+    'debug> '
+

Added: zope.app.appsetup/trunk/src/zope/app/appsetup/testdata/pythonstartup
===================================================================
--- zope.app.appsetup/trunk/src/zope/app/appsetup/testdata/pythonstartup	                        (rev 0)
+++ zope.app.appsetup/trunk/src/zope/app/appsetup/testdata/pythonstartup	2008-08-25 22:40:26 UTC (rev 90249)
@@ -0,0 +1,2 @@
+import sys
+sys.ps1 = 'debug> '

Modified: zope.app.appsetup/trunk/src/zope/app/appsetup/tests.py
===================================================================
--- zope.app.appsetup/trunk/src/zope/app/appsetup/tests.py	2008-08-25 22:36:31 UTC (rev 90248)
+++ zope.app.appsetup/trunk/src/zope/app/appsetup/tests.py	2008-08-25 22:40:26 UTC (rev 90249)
@@ -201,6 +201,8 @@
 def tearDownDebug(test):
     sys.stderr = test.real_stderr
     sys.argv[:] = test.real_argv
+    if hasattr(sys, 'ps1'):
+        del sys.ps1
     os.chdir(test.olddir)
     # make sure we don't leave environment variables that would cause
     # Python to open an interactive console