subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1586556 - in /subversion/branches/1.8.x: ./ STATUS subversion/tests/cmdline/wc_tests.py
Date Fri, 11 Apr 2014 04:01:33 GMT
Author: svn-role
Date: Fri Apr 11 04:01:33 2014
New Revision: 1586556

URL: http://svn.apache.org/r1586556
Log:
Merge r1583580 from trunk:

 * r1583580
   Skip a test that fails when run as root.
   Justification:
     Avoids spurious FAIL.
   Votes:
     +1: philip, rhuijben, julianfoad

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/tests/cmdline/wc_tests.py

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1583580

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1586556&r1=1586555&r2=1586556&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Fri Apr 11 04:01:33 2014
@@ -386,13 +386,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1583580
-   Skip a test that fails when run as root.
-   Justification:
-     Avoids spurious FAIL.
-   Votes:
-     +1: philip, rhuijben, julianfoad
-
  * r1586255
    Fix propget/proplist error on invalid revisions
    Justification:

Modified: subversion/branches/1.8.x/subversion/tests/cmdline/wc_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/tests/cmdline/wc_tests.py?rev=1586556&r1=1586555&r2=1586556&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/tests/cmdline/wc_tests.py (original)
+++ subversion/branches/1.8.x/subversion/tests/cmdline/wc_tests.py Fri Apr 11 04:01:33 2014
@@ -118,8 +118,13 @@ def add_with_symlink_in_path(sbox):
   sbox.simple_append('A/B/kappa', 'xyz', True)
   sbox.simple_add('Z/B/kappa')
 
+def is_posix_os_and_not_root():
+  if not svntest.main.is_posix_os():
+    return False
+  return os.getuid() != 0
+
 @Issue(4118)
-@SkipUnless(svntest.main.is_posix_os)
+@SkipUnless(is_posix_os_and_not_root)
 def status_with_inaccessible_wc_db(sbox):
   """inaccessible .svn/wc.db"""
 



Mime
View raw message