Author: stefan2
Date: Wed Nov 25 13:32:19 2015
New Revision: 1716394
URL: http://svn.apache.org/viewvc?rev=1716394&view=rev
Log:
Don't have different tests produce the same files.
* subversion/tests/cmdline/svnrdump_tests.py
(dont_drop_valid_mergeinfo_during_incremental_svnrdump_loads):
Use test-specific dump file names, so they
won't overlap with the svnadmin dump tests.
Modified:
subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py?rev=1716394&r1=1716393&r2=1716394&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py Wed Nov 25
13:32:19 2015
@@ -541,7 +541,7 @@ def dont_drop_valid_mergeinfo_during_inc
# PART 2: Load a series of incremental dumps to an empty repository.
#
# Incrementally dump the repository into three dump files:
- dump_file_r1_10 = svntest.main.temp_dir + "-r1-10.dump"
+ dump_file_r1_10 = svntest.main.temp_dir + "-r1-10.rdump"
output = svntest.actions.run_and_verify_svnrdump(None,
svntest.verify.AnyOutput,
[], 0, '-q', 'dump',
'-r1:10',
@@ -550,7 +550,7 @@ def dont_drop_valid_mergeinfo_during_inc
dump_fp.writelines(output)
dump_fp.close()
- dump_file_r11_13 = svntest.main.temp_dir + "-r11-13.dump"
+ dump_file_r11_13 = svntest.main.temp_dir + "-r11-13.rdump"
output = svntest.actions.run_and_verify_svnrdump(None,
svntest.verify.AnyOutput,
[], 0, '-q', 'dump',
@@ -560,7 +560,7 @@ def dont_drop_valid_mergeinfo_during_inc
dump_fp.writelines(output)
dump_fp.close()
- dump_file_r14_15 = svntest.main.temp_dir + "-r14-15.dump"
+ dump_file_r14_15 = svntest.main.temp_dir + "-r14-15.rdump"
output = svntest.actions.run_and_verify_svnrdump(None,
svntest.verify.AnyOutput,
[], 0, '-q', 'dump',
