Author: rhuijben
Date: Sun Feb 24 22:17:59 2013
New Revision: 1449559
URL: http://svn.apache.org/r1449559
Log:
* subversion/tests/cmdline/trans_tests.py
(autoprops_inconsistent_eol): Use readonly sandbox.
(autoprops_inconsistent_mime): New XFail test, showing another case where
autoprops can make adds fail.
(test_list): Add autoprops_inconsistent_mime.
Modified:
subversion/trunk/subversion/tests/cmdline/trans_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/trans_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/trans_tests.py?rev=1449559&r1=1449558&r2=1449559&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/trans_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/trans_tests.py Sun Feb 24
22:17:59 2013
@@ -887,7 +887,7 @@ def props_only_file_update(sbox):
def autoprops_inconsistent_eol(sbox):
"able to handle inconsistent eols on add"
- sbox.build()
+ sbox.build(read_only = True)
wc_dir = sbox.wc_dir
text = 'line with NL\n' + \
@@ -929,9 +929,29 @@ def autoprops_inconsistent_eol(sbox):
expected_output = ['A %s\n' % sbox.ospath('auto.c')]
+ # Fails with svn: E200009: File '.*auto.c' has inconsistent newlines
svntest.actions.run_and_verify_svn(None, expected_output,
[], 'add', sbox.ospath('auto.c'))
+@XFail()
+def autoprops_inconsistent_mime(sbox):
+ "able to handle inconsistent mime on add"
+
+ sbox.build(read_only = True)
+
+ sbox.simple_propset('svn:auto-props',
+ '*.c = svn:eol-style=native\n'
+ 'c.* = svn:mime-type=application/octet-stream', '')
+
+ sbox.simple_append('c.iota.c', '')
+
+ expected_output = ['A %s\n' % sbox.ospath('c.iota.c')]
+
+ # Fails with svn: E200009: File '.*c.iota.c' has binary mime type property
+ svntest.actions.run_and_verify_svn(None, expected_output,
+ [], 'add', sbox.ospath('c.iota.c'))
+
+
########################################################################
# Run the tests
@@ -951,6 +971,7 @@ test_list = [ None,
propset_revert_noerror,
props_only_file_update,
autoprops_inconsistent_eol,
+ autoprops_inconsistent_mime,
]
if __name__ == '__main__':
