Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1389928 -
 /subversion/trunk/subversion/tests/cmdline/stat_tests.py
Date: Tue, 25 Sep 2012 15:30:45 -0000
To: commits@subversion.apache.org
From: stsp@apache.org
Message-Id: <20120925153045.2FC8323888EA@eris.apache.org>

Author: stsp
Date: Tue Sep 25 15:30:44 2012
New Revision: 1389928

URL: http://svn.apache.org/viewvc?rev=1389928&view=rev
Log:
* subversion/tests/cmdline/stat_tests.py
  (status_unversioned_dir): Create a nested unversioned directory inside the
   standard test working copy, to avoid an unexpected error message when this
   test is run within a working copy with an unsupported newer format.
   The 'node not found' error is now the only possible error condition
   so stop checking for 'not a working copy'. We'll need a separate test
   for the latter error condition -- this test would somehow have to avoid
   failing within a working copy using an unsupported format.

Suggested by: philip

Modified:
    subversion/trunk/subversion/tests/cmdline/stat_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/stat_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/stat_tests.py?rev=1389928&r1=1389927&r2=1389928&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/stat_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/stat_tests.py Tue Sep 25 15:30:44 2012
@@ -989,20 +989,15 @@ def status_ignored_dir(sbox):
 @Issue(2030)
 def status_unversioned_dir(sbox):
   "status on unversioned dir"
-  sbox.build(read_only = True, create_wc = False)
-  path = sbox.wc_dir
-  svntest.main.safe_rmtree(sbox.wc_dir)
-  os.mkdir(path)
-
-  # Depending on whether you run the tests below a working copy
-  # or not, the error message might either be something like
-  # svn: warning: W155007: '...copies/stat_tests-19' is not a working copy
-  # or
-  # svn: warning: W155010: The node '...copies/stat_tests-19' was not found.
+  sbox.build(read_only = True)
+
+  # Create two unversioned directories within the test working copy
+  path = sbox.ospath('1/2')
+  os.makedirs(path)
 
   expected_err = "svn: warning: W1550(07|10): .*'.*(/|\\\\)" + \
                  os.path.basename(path) + \
-                 "' (is not a working copy|was not found)"
+                 "' was not found"
   svntest.actions.run_and_verify_svn2(None, [], expected_err, 0,
                                       "status", path)