Author: rhuijben
Date: Sun Apr 19 12:09:55 2015
New Revision: 1674613
URL: http://svn.apache.org/r1674613
Log:
Avoid raising skip exceptions without description in the python tests.
* subversion/tests/cmdline/checkout_tests.py
(checkout_wc_from_drive): Use @SkipUnless instead of code.
Add explanation.
* subversion/tests/cmdline/svnadmin_tests.py
(verify_incremental_fsfs): Add explanation.
* subversion/tests/cmdline/svnsync_authz_tests.py
(identity_copy): Add explanation.
* subversion/tests/cmdline/switch_tests.py
(refresh_read_only_attribute): Add explanation.
* subversion/tests/cmdline/update_tests.py
(update_wc_on_windows_drive): Use @SkipUnless instead of code.
Add explanation.
(skip_access_denied): Add explanation.
Modified:
subversion/trunk/subversion/tests/cmdline/checkout_tests.py
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
subversion/trunk/subversion/tests/cmdline/svnsync_authz_tests.py
subversion/trunk/subversion/tests/cmdline/switch_tests.py
subversion/trunk/subversion/tests/cmdline/update_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/checkout_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/checkout_tests.py?rev=1674613&r1=1674612&r2=1674613&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/checkout_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/checkout_tests.py Sun Apr 19
12:09:55 2015
@@ -1044,6 +1044,7 @@ def co_with_obstructing_local_adds(sbox)
#----------------------------------------------------------------------
# Test if checking out from a Windows driveroot is supported.
+@SkipUnless(svntest.main.is_os_windows)
def checkout_wc_from_drive(sbox):
"checkout from the root of a Windows drive"
@@ -1070,10 +1071,6 @@ def checkout_wc_from_drive(sbox):
return None
- # Skip the test if not on Windows
- if not svntest.main.windows:
- raise svntest.Skip
-
# just create an empty folder, we'll checkout later.
sbox.build(create_wc = False)
svntest.main.safe_rmtree(sbox.wc_dir)
@@ -1082,7 +1079,7 @@ def checkout_wc_from_drive(sbox):
# create a virtual drive to the repository folder
drive = find_the_next_available_drive_letter()
if drive is None:
- raise svntest.Skip
+ raise svntest.Skip('No drive letter available')
subprocess.call(['subst', drive +':', sbox.repo_dir])
repo_url = 'file:///' + drive + ':/'
Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1674613&r1=1674612&r2=1674613&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Sun Apr 19
12:09:55 2015
@@ -792,7 +792,7 @@ def verify_incremental_fsfs(sbox):
# the listing itself is valid.
r2 = fsfs_file(sbox.repo_dir, 'revs', '2')
if r2.endswith('pack'):
- raise svntest.Skip
+ raise svntest.Skip('Test doesn\'t handle packed revisions')
fp = open(r2, 'wb')
fp.write("""id: 0-2.0.r2/0
@@ -2646,7 +2646,7 @@ def fsfs_hotcopy_progress(sbox):
# and incremental scenarios. The progress output can be affected by
# the --fsfs-packing option, so skip the test if that is the case.
if svntest.main.options.fsfs_packing:
- raise svntest.Skip
+ raise svntest.Skip('fsfs packing set')
# Create an empty repository, configure three files per shard.
sbox.build(create_wc=False, empty=True)
@@ -2760,7 +2760,7 @@ def fsfs_hotcopy_progress_with_revprop_c
# The progress output can be affected by the --fsfs-packing
# option, so skip the test if that is the case.
if svntest.main.options.fsfs_packing:
- raise svntest.Skip
+ raise svntest.Skip('fsfs packing set')
# Create an empty repository, commit several revisions and hotcopy it.
sbox.build(create_wc=False, empty=True)
Modified: subversion/trunk/subversion/tests/cmdline/svnsync_authz_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_authz_tests.py?rev=1674613&r1=1674612&r2=1674613&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnsync_authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnsync_authz_tests.py Sun Apr 19
12:09:55 2015
@@ -383,7 +383,7 @@ def identity_copy(sbox):
except:
pass
if locale.setlocale(locale.LC_ALL) != other_locale:
- raise svntest.Skip
+ raise svntest.Skip('Setting test locale failed')
try:
run_test(sbox, "copy-bad-encoding.expected.dump",
Modified: subversion/trunk/subversion/tests/cmdline/switch_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/switch_tests.py?rev=1674613&r1=1674612&r2=1674613&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/switch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/switch_tests.py Sun Apr 19
12:09:55 2015
@@ -771,7 +771,7 @@ def refresh_read_only_attribute(sbox):
# behavior, just skip the test.
if os.name == 'posix':
if os.geteuid() == 0:
- raise svntest.Skip
+ raise svntest.Skip('Test doesn\'t work as uid 0')
sbox.build()
wc_dir = sbox.wc_dir
Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1674613&r1=1674612&r2=1674613&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Sun Apr 19
12:09:55 2015
@@ -2227,6 +2227,7 @@ def forced_update_failures(sbox):
# Test for issue #2556. The tests maps a virtual drive to a working copy
# and tries some basic update, commit and status actions on the virtual
# drive.
+@SkipUnless(svntest.main.is_os_windows)
def update_wc_on_windows_drive(sbox):
"update wc on the root of a Windows (virtual) drive"
@@ -2253,10 +2254,6 @@ def update_wc_on_windows_drive(sbox):
return None
- # Skip the test if not on Windows
- if not svntest.main.windows:
- raise svntest.Skip
-
# just create an empty folder, we'll checkout later.
sbox.build(create_wc = False)
svntest.main.safe_rmtree(sbox.wc_dir)
@@ -2265,7 +2262,7 @@ def update_wc_on_windows_drive(sbox):
# create a virtual drive to the working copy folder
drive = find_the_next_available_drive_letter()
if drive is None:
- raise svntest.Skip
+ raise svntest.Skip('No drive letter available')
subprocess.call(['subst', drive +':', sbox.wc_dir])
wc_dir = drive + ':/'
@@ -5137,7 +5134,7 @@ def skip_access_denied(sbox):
try:
import msvcrt
except ImportError:
- raise svntest.Skip
+ raise svntest.Skip('python msvcrt library not available')
sbox.build()
wc_dir = sbox.wc_dir
