You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/12/21 12:26:51 UTC
svn commit: r1051459 -
/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
Author: philip
Date: Tue Dec 21 11:26:51 2010
New Revision: 1051459
URL: http://svn.apache.org/viewvc?rev=1051459&view=rev
Log:
Extend a 1.6-to-wcng upgrade test.
* subversion/tests/cmdline/upgrade_tests.py
(simple_checksum_verify): New.
(replaced_files): Verify checksums.
Modified:
subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1051459&r1=1051458&r2=1051459&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Tue Dec 21 11:26:51 2010
@@ -182,6 +182,22 @@ def simple_property_verify(dir_path, exp
print('Actual properties: %s' % actual_props)
raise svntest.Failure("Properties unequal")
+def simple_checksum_verify(expected_checksums):
+
+ for path, checksum in expected_checksums:
+ exit_code, output, errput = svntest.main.run_svn(None, 'info', path)
+ if exit_code:
+ raise svntest.Failure()
+ if checksum:
+ if not svntest.verify.RegexOutput('Checksum: ' + checksum,
+ match_all=False).matches(output):
+ raise svntest.Failure("did not get expected checksum " + checksum)
+ if not checksum:
+ if svntest.verify.RegexOutput('Checksum: ',
+ match_all=False).matches(output):
+ raise svntest.Failure("unexpected checksum")
+
+
def run_and_verify_status_no_server(wc_dir, expected_status):
"same as svntest.actions.run_and_verify_status(), but without '-u'"
@@ -792,6 +808,14 @@ def replaced_files(sbox):
'B/g' : {'pY' : 'vY' },
})
+ simple_checksum_verify([
+ [sbox.ospath('A/f'), 'e59e06d2a8b63f23e230003b5a15e2d0'], # temp MD5
+ #[sbox.ospath('A/f'), '395dfb603d8a4e0348d0b082803f2b7426c76eb9'],
+ [sbox.ospath('A/g'), None],
+ [sbox.ospath('B/f'), 'e59e06d2a8b63f23e230003b5a15e2d0'], # temp MD5
+ #[sbox.ospath('B/f'), '395dfb603d8a4e0348d0b082803f2b7426c76eb9'],
+ [sbox.ospath('B/g'), None]])
+
svntest.actions.run_and_verify_svn(None, 'Reverted.*', [], 'revert',
sbox.ospath('A/f'), sbox.ospath('B/f'),
sbox.ospath('A/g'), sbox.ospath('B/g'))
@@ -803,6 +827,12 @@ def replaced_files(sbox):
'B/g' : {'pAg' : 'vAg' },
})
+ simple_checksum_verify([
+ [sbox.ospath('A/f'), '958eb2d755df2d9e0de6f7b835aec16b64d83f6f'],
+ [sbox.ospath('A/g'), '395dfb603d8a4e0348d0b082803f2b7426c76eb9'],
+ [sbox.ospath('B/f'), '958eb2d755df2d9e0de6f7b835aec16b64d83f6f'],
+ [sbox.ospath('B/g'), '395dfb603d8a4e0348d0b082803f2b7426c76eb9']])
+
########################################################################
# Run the tests