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

[ju...@apache.org]

Author: julianfoad
Date: Thu Mar 22 11:30:48 2012
New Revision: 1303737

URL: http://svn.apache.org/viewvc?rev=1303737&view=rev
Log:
Fix the timing measurement of copying a repository, in the test suite. Also only
log that timing if 'log_with_timestamps' is true, following r1303737.

* subversion/tests/cmdline/svntest/main.py
  (copy_repos): Don't stop the clock until the commands have completed. Only
    log the '<TIME = ...>' line if 'log_with_timestamps' is true.

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=1303737&r1=1303736&r2=1303737&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Thu Mar 22 11:30:48 2012
@@ -875,9 +875,6 @@ def copy_repos(src_path, dst_path, head_
     [svnadmin_binary] + load_args,
     stdin=dump_out) # Attached to dump_kid
 
-  stop = time.time()
-  logger.info('<TIME = %.6f>' % (stop - start))
-
   load_stdout, load_stderr, load_exit_code = wait_on_pipe(load_kid, True)
   dump_stdout, dump_stderr, dump_exit_code = wait_on_pipe(dump_kid, True)
 
@@ -888,6 +885,10 @@ def copy_repos(src_path, dst_path, head_
   load_out.close()
   load_err.close()
 
+  if log_with_timestamps:
+    stop = time.time()
+    logger.info('<TIME = %.6f>' % (stop - start))
+
   if saved_quiet is None:
     del os.environ['SVN_DBG_QUIET']
   else: