svn commit: r941975 - /subversion/trunk/subversion/tests/cmdline/svntest/factory.py

[ne...@apache.org]

Author: neels
Date: Fri May  7 00:05:48 2010
New Revision: 941975

URL: http://svn.apache.org/viewvc?rev=941975&view=rev
Log:
* subversion/tests/cmdline/svntest/factory.py (TestFactory):
    Make a distiction between quiet and unquiet status.

Modified:
    subversion/trunk/subversion/tests/cmdline/svntest/factory.py

Modified: subversion/trunk/subversion/tests/cmdline/svntest/factory.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/factory.py?rev=941975&r1=941974&r2=941975&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/factory.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/factory.py Fri May  7 00:05:48 2010
@@ -531,10 +531,16 @@ class TestFactory:
         py += '# SKIPPING NON-WC ' + target.runarg + '\n'
         continue
 
-      pystatus = self.get_current_status(target.wc)
-      py += (pystatus +
-             "actions.run_and_verify_status(" + target.wc.py +
-             ", expected_status)\n")
+      if '-q' in status_args:
+        pystatus = self.get_current_status(target.wc, True)
+        py += (pystatus +
+               "actions.run_and_verify_status(" + target.wc.py +
+               ", expected_status)\n")
+      else:
+        pystatus = self.get_current_status(target.wc, False)
+        py += (pystatus +
+               "actions.run_and_verify_unquiet_status(" + target.wc.py +
+               ", expected_status)\n")
     return py
 
 
@@ -933,10 +939,14 @@ class TestFactory:
     self.prev_disk = [wc.realpath, actual]
 
 
-  def get_current_status(self, wc):
+  def get_current_status(self, wc, quiet=True):
     "Probes the given working copy and writes an expected_status for it."
-    code, output, err = main.run_svn(None, 'status', '-v', '-u', '-q',
-                                     wc.realpath)
+    if quiet:
+      code, output, err = main.run_svn(None, 'status', '-v', '-u', '-q',
+                                       wc.realpath)
+    else:
+      code, output, err = main.run_svn(None, 'status', '-v', '-u',
+                                       wc.realpath)
     if code != 0 or len(err) > 0:
       raise Failure("Hmm. `svn status' failed. What now.")