svn commit: r933473 - /subversion/trunk/subversion/tests/cmdline/svntest/main.py

[gs...@apache.org]

Author: gstein
Date: Tue Apr 13 03:14:28 2010
New Revision: 933473

URL: http://svn.apache.org/viewvc?rev=933473&view=rev
Log:
The test framework was blowing away the environment's SVN_DBG_QUIET
setting, which may (also) have been disabling debug messages. Simple fix:
just save the old value (if any).

* subversion/tests/cmdline/svntests/main.py:
  (create_repos): save the original value of SVN_DBG_QUIET, then restore
    the environment to the correct state.

Modified:
    subversion/trunk/subversion/tests/cmdline/svntest/main.py

Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=933473&r1=933472&r2=933473&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Tue Apr 13 03:14:28 2010
@@ -789,9 +789,12 @@ def create_repos(path):
 def copy_repos(src_path, dst_path, head_revision, ignore_uuid = 1):
   "Copy the repository SRC_PATH, with head revision HEAD_REVISION, to DST_PATH"
 
+  # Save any previous value of SVN_DBG_QUIET
+  saved_quiet = os.environ.get('SVN_DBG_QUIET')
+  os.environ['SVN_DBG_QUIET'] = 'y'
+
   # Do an svnadmin dump|svnadmin load cycle. Print a fake pipe command so that
   # the displayed CMDs can be run by hand
-  os.environ['SVN_DBG_QUIET'] = 'y'
   create_repos(dst_path)
   dump_args = ['dump', src_path]
   load_args = ['load', dst_path]
@@ -825,7 +828,10 @@ def copy_repos(src_path, dst_path, head_
   load_out.close()
   load_err.close()
 
-  del os.environ['SVN_DBG_QUIET']
+  if saved_quiet is None:
+    del os.environ['SVN_DBG_QUIET']
+  else:
+    os.environ['SVN_DBG_QUIET'] = saved_quiet
 
   dump_re = re.compile(r'^\* Dumped revision (\d+)\.\r?$')
   expect_revision = 0