Author: ivan
Date: Sat Feb 14 11:24:42 2015
New Revision: 1659780
URL: http://svn.apache.org/r1659780
Log:
On the remove-log-addressing branch: Remove trailing whitespaces to
minify difference with trunk.
* subversion/tests/libsvn_subr/x509-test.c
* tools/dist/backport_tests.py
(): Remove trailing whitespace.
Modified:
subversion/branches/remove-log-addressing/subversion/tests/libsvn_subr/x509-test.c
subversion/branches/remove-log-addressing/tools/dist/backport_tests.py
Modified:
subversion/branches/remove-log-addressing/subversion/tests/libsvn_subr/x509-test.c
URL:
http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/libsvn_subr/x509-test.c?rev=1659780&r1=1659779&r2=1659780&view=diff
==============================================================================
---
subversion/branches/remove-log-addressing/subversion/tests/libsvn_subr/x509-test.c
(original)
+++
subversion/branches/remove-log-addressing/subversion/tests/libsvn_subr/x509-test.c
Sat Feb 14 11:24:42 2015
@@ -151,7 +151,7 @@ static struct x509_test cert_tests[] = {
"b3b9789d8a53868f418619565f6b56af0033bdd3" },
/* The issuer and subject (except for the country code) is
* UnversalString encoded. Created with a hacked version of openssl
- * using utf8=yes and string_mask=MASK:256. In order for that to
+ * using utf8=yes and string_mask=MASK:256. In order for that to
* output UniversalString encoded data you need to change the
* DIRSTRING_TYPE in crypto/asn1/asn1.h to be defined as
* B_ASN1_DIRECTORYSTRING so that UnviersalString is available to be
Modified: subversion/branches/remove-log-addressing/tools/dist/backport_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/dist/backport_tests.py?rev=1659780&r1=1659779&r2=1659780&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/tools/dist/backport_tests.py
(original)
+++ subversion/branches/remove-log-addressing/tools/dist/backport_tests.py Sat
Feb 14 11:24:42 2015
@@ -74,38 +74,38 @@ class BackportTest(object):
"""Return a decorator that: builds TEST_FUNC's sbox, creates
^/subversion/trunk, and calls TEST_FUNC, then compare its output to the
expected dump file named after TEST_FUNC."""
-
+
# .wraps() propagates the wrappee's docstring to the wrapper.
- @functools.wraps(test_func)
+ @functools.wraps(test_func)
def wrapped_test_func(sbox):
expected_dump_file = './%s.dump' % (test_func.func_name,)
sbox.build()
-
+
# r2: prepare ^/subversion/ tree
sbox.simple_mkdir('subversion', 'subversion/trunk')
sbox.simple_mkdir('subversion/tags', 'subversion/branches')
sbox.simple_move('A', 'subversion/trunk')
sbox.simple_move('iota', 'subversion/trunk')
sbox.simple_commit(message='Create trunk')
-
+
# r3: branch
sbox.simple_copy('subversion/trunk', 'branch')
sbox.simple_append('branch/STATUS', '')
sbox.simple_add('branch/STATUS')
sbox.simple_commit(message='Create branch, with STATUS file')
-
+
# r4: random change on trunk
sbox.simple_append('subversion/trunk/iota', 'First change\n')
sbox.simple_commit(message='First change')
-
+
# r5: random change on trunk
sbox.simple_append('subversion/trunk/A/mu', 'Second change\n')
sbox.simple_commit(message='Second change')
-
+
# Do the work.
test_func(sbox)
-
+
# Verify it.
verify_backport(sbox, expected_dump_file, self.uuid)
return wrapped_test_func
@@ -139,7 +139,7 @@ def serialize_entry(entry):
# notes
' Notes: %s\n' % (entry['notes'],) if entry['notes'] else '',
-
+
# branch
' Branch: %s\n' % (entry['branch'],) if entry['branch'] else '',
@@ -294,7 +294,7 @@ def backport_accept(sbox):
# r6: conflicting change on branch
sbox.simple_append('branch/iota', 'Conflicts with first change\n')
sbox.simple_commit(message="Conflicting change on iota")
-
+
# r7: nominate r4 with --accept (because of r6)
approved_entries = [
make_entry([4], notes="Merge with --accept=theirs-conflict."),
@@ -318,7 +318,7 @@ def backport_branches(sbox):
# r6: conflicting change on branch
sbox.simple_append('branch/iota', 'Conflicts with first change')
sbox.simple_commit(message="Conflicting change on iota")
-
+
# r7: backport branch
sbox.simple_update()
sbox.simple_copy('branch', 'subversion/branches/r4')
@@ -367,7 +367,7 @@ def backport_conflicts_detection(sbox):
# r6: conflicting change on branch
sbox.simple_append('branch/iota', 'Conflicts with first change\n')
sbox.simple_commit(message="Conflicting change on iota")
-
+
# r7: nominate r4, but without the requisite --accept
approved_entries = [
make_entry([4], notes="This will conflict."),
