svn commit: r1070117 - /subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py

[st...@apache.org]

Author: stsp
Date: Sat Feb 12 17:36:39 2011
New Revision: 1070117

URL: http://svn.apache.org/viewvc?rev=1070117&view=rev
Log:
* subversion/tests/cmdline/svnadmin_tests.py
  (create_in_repo_subdir): Make sure this test fails unless
   SVNRepositoryCreateFailure is raised.

Suggested by: danielsh

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

Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1070117&r1=1070116&r2=1070117&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Sat Feb 12 17:36:39 2011
@@ -914,14 +914,18 @@ def create_in_repo_subdir(sbox):
   # This should succeed
   svntest.main.create_repos(repo_dir)
 
+  success = False
   try:
     # This should fail
     subdir = os.path.join(repo_dir, 'Z')
     svntest.main.create_repos(subdir)
   except svntest.main.SVNRepositoryCreateFailure:
-    pass
+    success = True
+  if not success:
+    raise svntest.Failure
 
   cwd = os.getcwd()
+  success = False
   try:
     # This should fail, too
     subdir = os.path.join(repo_dir, 'conf')
@@ -929,11 +933,11 @@ def create_in_repo_subdir(sbox):
     svntest.main.create_repos('Z')
     os.chdir(cwd)
   except svntest.main.SVNRepositoryCreateFailure:
+    success = True
     os.chdir(cwd)
-    return
+  if not success:
+    raise svntest.Failure
 
-  # No SVNRepositoryCreateFailure raised?
-  raise svntest.Failure
 
 @SkipUnless(svntest.main.is_fs_type_fsfs)
 def verify_with_invalid_revprops(sbox):