You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by da...@apache.org on 2015/03/29 09:24:55 UTC

svn commit: r1669867 - /subversion/trunk/tools/dist/backport/merger.py

Author: danielsh
Date: Sun Mar 29 07:24:55 2015
New Revision: 1669867

URL: http://svn.apache.org/r1669867
Log:
* tools/dist/backport/merger.py
  (Test_invoking_cmdline_client.test_run_svn):
    Fix a testsuite bug that caused a validation call to become dead code.

Modified:
    subversion/trunk/tools/dist/backport/merger.py

Modified: subversion/trunk/tools/dist/backport/merger.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport/merger.py?rev=1669867&r1=1669866&r2=1669867&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport/merger.py (original)
+++ subversion/trunk/tools/dist/backport/merger.py Sun Mar 29 07:24:55 2015
@@ -87,8 +87,8 @@ class Test_invoking_cmdline_client(unitt
 
     run_svn(['--version', '--no-such-option'], "invalid option")
 
-    with self.assertRaises(subprocess.CalledProcessError):
-      with self.assertLogs() as cm:
+    with self.assertLogs() as cm:
+      with self.assertRaises(subprocess.CalledProcessError):
         run_svn(['--version', '--no-such-option'])
       self.assertRegex(cm.output[0], "Unexpected stderr.*")