You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2015/11/26 23:43:49 UTC
svn commit: r1716779 - in /subversion/trunk/subversion/tests/cmdline:
svnadmin_tests.py svnrdump_tests.py
Author: stefan2
Date: Thu Nov 26 22:43:49 2015
New Revision: 1716779
URL: http://svn.apache.org/viewvc?rev=1716779&view=rev
Log:
Minor test dump / rdump test code improvement.
Suggested by: rhuijben
* subversion/tests/cmdline/svnadmin_tests.py
(dont_drop_valid_mergeinfo_during_incremental_loads): Use the sandbox API
to create & manage the temporary dump files. Give them specific name
prefixes to make debugging easier in case the dump files are dodgy.
* subversion/tests/cmdline/svnrdump_tests.py
(dont_drop_valid_mergeinfo_during_incremental_svnrdump_loads): Same.
Modified:
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1716779&r1=1716778&r2=1716779&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Thu Nov 26 22:43:49 2015
@@ -1383,21 +1383,21 @@ def dont_drop_valid_mergeinfo_during_inc
# PART 2: Load a 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 = sbox.get_tempname("r1-10-dump")
exit_code, output, errput = svntest.main.run_svnadmin(
'dump', sbox.repo_dir, '-r1:10')
dump_fp = open(dump_file_r1_10, 'wb')
dump_fp.writelines(output)
dump_fp.close()
- dump_file_r11_13 = svntest.main.temp_dir + "-r11-13.dump"
+ dump_file_r11_13 = sbox.get_tempname("r11-13-dump")
exit_code, output, errput = svntest.main.run_svnadmin(
'dump', sbox.repo_dir, '--incremental', '-r11:13')
dump_fp = open(dump_file_r11_13, 'wb')
dump_fp.writelines(output)
dump_fp.close()
- dump_file_r14_15 = svntest.main.temp_dir + "-r14-15.dump"
+ dump_file_r14_15 = sbox.get_tempname("r14-15-dump")
exit_code, output, errput = svntest.main.run_svnadmin(
'dump', sbox.repo_dir, '--incremental', '-r14:15')
dump_fp = open(dump_file_r14_15, 'wb')
Modified: subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py?rev=1716779&r1=1716778&r2=1716779&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py Thu Nov 26 22:43:49 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.rdump"
+ dump_file_r1_10 = sbox.get_tempname("r1-10-dump")
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.rdump"
+ dump_file_r11_13 = sbox.get_tempname("r11-13-dump")
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.rdump"
+ dump_file_r14_15 = sbox.get_tempname("r14-15-dump")
output = svntest.actions.run_and_verify_svnrdump(None,
svntest.verify.AnyOutput,
[], 0, '-q', 'dump',