[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-commits
Subject:    svn commit: r1832179 - /subversion/trunk/subversion/tests/cmdline/shelf_tests.py
From:       julianfoad () apache ! org
Date:       2018-05-24 15:01:21
Message-ID: 20180524150122.035DC3A00AF () svn01-us-west ! apache ! org
[Download RAW message or body]

Author: julianfoad
Date: Thu May 24 15:01:21 2018
New Revision: 1832179

URL: http://svn.apache.org/viewvc?rev=1832179&view=rev
Log:
Shelving: test 'svn status' a little more comprehensively.

* subversion/tests/cmdline/shelf_tests.py
  (shelf_status): Test more changes than just an add.

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

Modified: subversion/trunk/subversion/tests/cmdline/shelf_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/shelf_tests.py?rev=1832179&r1=1832178&r2=1832179&view=diff
 ==============================================================================
--- subversion/trunk/subversion/tests/cmdline/shelf_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/shelf_tests.py Thu May 24 15:01:21 2018
@@ -419,19 +419,32 @@ def shelve_with_log_message(sbox):
 def shelf_status(sbox):
   "shelf status"
 
-  sbox.build(empty=True)
+  sbox.build()
   was_cwd = os.getcwd()
   os.chdir(sbox.wc_dir)
   sbox.wc_dir = ''
 
   sbox.simple_add_text('New file', 'f')
+  sbox.simple_append('iota', 'New text')
+  sbox.simple_propset('p', 'v', 'A/mu')
+  sbox.simple_rm('A/B/E', 'A/B/lambda')
+  expected_status = [
+    "D       A/B/E",
+    "D       A/B/lambda",
+    " M      A/mu",
+    "A       f",
+    "M       iota",
+    ]
+  expected_output = svntest.verify.UnorderedRegexListOutput(expected_status)
+  svntest.actions.run_and_verify_svn(expected_output, [],
+                                     'status')
+
   svntest.actions.run_and_verify_svn(None, [],
                                      'shelve', 'foo')
-  expected_output = svntest.verify.RegexListOutput(
+  expected_output = svntest.verify.UnorderedRegexListOutput(
     ["",
      "--- Changelist 'svn:shelf:foo':",
-     "A       f",
-    ])
+    ] + expected_status)
   svntest.actions.run_and_verify_svn(expected_output, [],
                                      'status', '--cl=svn:shelf:foo')
 


[prev in list] [next in list] [prev in thread] [next in thread]