Re: [PATCH] Fix failing expected error in blame_tests.py

[Noorul Islam K M]

Noorul Islam K M <noo...@collab.net> writes:

> Log
> [[[
>
> Fix failing expected error regex.
>
> * subversion/tests/cmdline/blame_tests.py
>   (blame_non_existent_url_target): Relax regex to allow errors from
>    http: and svn: protocols.
>
> Patch by: Noorul Islam K M <noorul{_AT_}collab.net>
> ]]]
>
> Index: subversion/tests/cmdline/blame_tests.py
> ===================================================================
> --- subversion/tests/cmdline/blame_tests.py   (revision 1071613)
> +++ subversion/tests/cmdline/blame_tests.py   (working copy)
> @@ -759,8 +759,7 @@
>      "     2    jrandom New contents for iota\n",
>      ]
>  
> -  expected_err = "svn: warning: W160017: '/non-existent' " +  \
> -      "is not a file in revision 2\n" + \
> +  expected_err = "svn: warning: W160017: .*\n" +  \
>        ".*\nsvn: E200009: Could not perform blame on all targets " + \
>        "because some targets don't exist\n"
>    expected_err_re = re.compile(expected_err)

Stefen,

Please find attached modified patch.

 Log
 [[[

 Fix failing expected error regex. Also capture ra_neon error.

 * subversion/svn/blame-cmd.c
   (svn_cl__blame): Catch SVN_ERR_FS_NOT_FOUND and display warning.

 * subversion/tests/cmdline/blame_tests.py
   (blame_non_existent_url_target): Relax regex to allow errors from
    http: and svn: protocols.

 Patch by: Noorul Islam K M <noorul{_AT_}collab.net>
 ]]]


Index: subversion/tests/cmdline/blame_tests.py
===================================================================
--- subversion/tests/cmdline/blame_tests.py     (revision 1071618)
+++ subversion/tests/cmdline/blame_tests.py     (working copy)
@@ -759,8 +759,7 @@
     "     2    jrandom New contents for iota\n",
     ]
 
-  expected_err = "svn: warning: W160017: '/non-existent' " +  \
-      "is not a file in revision 2\n" + \
+  expected_err = "svn: warning: (W160017|W160013): .*\n" +  \
       ".*\nsvn: E200009: Could not perform blame on all targets " + \
       "because some targets don't exist\n"
   expected_err_re = re.compile(expected_err)
Index: subversion/svn/blame-cmd.c
===================================================================
--- subversion/svn/blame-cmd.c  (revision 1071618)
+++ subversion/svn/blame-cmd.c  (working copy)
@@ -379,7 +379,8 @@
                                           target));
             }
          else if (err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND ||
-                   err->apr_err == SVN_ERR_FS_NOT_FILE)
+                   err->apr_err == SVN_ERR_FS_NOT_FILE ||
+                   err->apr_err == SVN_ERR_FS_NOT_FOUND)
             {
               svn_handle_warning2(stderr, err, "svn: ");
               svn_error_clear(err);