Author: ivan
Date: Mon Oct 17 07:57:59 2016
New Revision: 1765216

URL: http://svn.apache.org/viewvc?rev=1765216&view=rev
Log:
Follow-up to r1765214: Use APR_EGENERAL error code instead of
SVN_ERR_ASSERTION_FAIL as test code, since test assertion macros have special
handling of SVN_ERR_ASSERTION_FAIL.

* subversion/tests/libsvn_subr/xml-test.c
  (err_end_elem): Return APR_EGENERAL, instead of SVN_ERR_ASSERTION_FAIL.
  (test_signal_bailout, test_invalid_xml_signal_bailout): Expect APR_EGENERAL.

Modified:
    subversion/trunk/subversion/tests/libsvn_subr/xml-test.c

Modified: subversion/trunk/subversion/tests/libsvn_subr/xml-test.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/xml-test.c?rev=1765216&r1=1765215&r2=1765216&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/xml-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/xml-test.c Mon Oct 17 
07:57:59 2016
@@ -74,8 +74,7 @@ err_end_elem(void *baton, const char *na
 {
   svn_xml_parser_t **parser = baton;
 
-  svn_xml_signal_bailout(svn_error_create(SVN_ERR_ASSERTION_FAIL, NULL,
-                                          NULL),
+  svn_xml_signal_bailout(svn_error_create(APR_EGENERAL, NULL, NULL),
                          *parser);
 }
 
@@ -145,7 +144,7 @@ test_signal_bailout(apr_pool_t *pool)
 
   parser = svn_xml_make_parser(&parser, NULL, err_end_elem, NULL, pool);
   err = svn_xml_parse(parser, xml, strlen(xml), TRUE);
-  SVN_TEST_ASSERT_ERROR(err, SVN_ERR_ASSERTION_FAIL);
+  SVN_TEST_ASSERT_ERROR(err, APR_EGENERAL);
 
   return SVN_NO_ERROR;
 }
@@ -167,7 +166,7 @@ test_invalid_xml_signal_bailout(apr_pool
   SVN_TEST_ASSERT_ANY_ERROR(err);
 
   if (err->apr_err != SVN_ERR_XML_MALFORMED &&
-      err->apr_err != SVN_ERR_ASSERTION_FAIL)
+      err->apr_err != APR_EGENERAL)
     {
       return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
                                "Got unxpected error '%s'",


Reply via email to