svn commit: r1390387 - in /subversion/branches/1.7.x-r1389928: ./ subversion/tests/cmdline/stat_tests.py

[st...@apache.org]

Author: stsp
Date: Wed Sep 26 10:33:43 2012
New Revision: 1390387

URL: http://svn.apache.org/viewvc?rev=1390387&view=rev
Log:
On the 1.7.x-r1389928 branch, merge r1389928, resolving conflicts.

Modified:
    subversion/branches/1.7.x-r1389928/   (props changed)
    subversion/branches/1.7.x-r1389928/subversion/tests/cmdline/stat_tests.py

Propchange: subversion/branches/1.7.x-r1389928/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1389928

Modified: subversion/branches/1.7.x-r1389928/subversion/tests/cmdline/stat_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1389928/subversion/tests/cmdline/stat_tests.py?rev=1390387&r1=1390386&r2=1390387&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1389928/subversion/tests/cmdline/stat_tests.py (original)
+++ subversion/branches/1.7.x-r1389928/subversion/tests/cmdline/stat_tests.py Wed Sep 26 10:33:43 2012
@@ -990,11 +990,16 @@ def status_ignored_dir(sbox):
 def status_unversioned_dir(sbox):
   "status on unversioned dir"
   sbox.build(read_only = True)
-  dir = sbox.repo_dir
-  expected_err = "svn: warning: W155007: '.*(/|\\\\)" + os.path.basename(dir) + \
+
+  # 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"
   svntest.actions.run_and_verify_svn2(None, [], expected_err, 0,
-                                      "status", dir, dir)
+                                      "status", path)
 
 #----------------------------------------------------------------------