[geode] branch develop updated: GEODE-3038 Fix suspect string found in logs during test run

[agingade]

This is an automated email from the ASF dual-hosted git repository.

agingade pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 0d5d2cb  GEODE-3038 Fix suspect string found in logs during test run
0d5d2cb is described below

commit 0d5d2cbadc50c5ec5d43889fc65eb8622a7f742e
Author: Anil <aging...@pivotal.io>
AuthorDate: Wed Nov 22 13:36:10 2017 -0800

    GEODE-3038 Fix suspect string found in logs during test run
---
 .../java/org/apache/geode/cache30/CacheXml66DUnitTest.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java 
b/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
index 4ce6757..de56ca6 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
@@ -3373,8 +3373,8 @@ public abstract class CacheXml66DUnitTest extends 
CacheXmlTestCase {
 
     setXmlFile(findFile("sameRootRegion.xml"));
 
-    IgnoredException expectedException =
-        IgnoredException.addIgnoredException("While reading Cache XML file");
+    IgnoredException.addIgnoredException("While reading Cache XML file");
+    
IgnoredException.addIgnoredException("org.apache.geode.cache.RegionExistsException");
     try {
       getCache();
       fail("Should have thrown a CacheXmlException");
@@ -3387,7 +3387,7 @@ public abstract class CacheXml66DUnitTest extends 
CacheXmlTestCase {
         Assert.fail("Expected a RegionExistsException, not a " + 
cause.getClass().getName(), cause);
       }
     } finally {
-      expectedException.remove();
+      IgnoredException.removeAllExpectedExceptions();
     }
   }
 
@@ -3415,8 +3415,8 @@ public abstract class CacheXml66DUnitTest extends 
CacheXmlTestCase {
 
     setXmlFile(findFile("sameSubregion.xml"));
 
-    IgnoredException expectedException =
-        IgnoredException.addIgnoredException("While reading Cache XML file");
+    IgnoredException.addIgnoredException("While reading Cache XML file");
+    
IgnoredException.addIgnoredException("org.apache.geode.cache.RegionExistsException");
     try {
       getCache();
       fail("Should have thrown a CacheXmlException");
@@ -3429,7 +3429,7 @@ public abstract class CacheXml66DUnitTest extends 
CacheXmlTestCase {
         Assert.fail("Expected a RegionExistsException, not a " + 
cause.getClass().getName(), cause);
       }
     } finally {
-      expectedException.remove();
+      IgnoredException.removeAllExpectedExceptions();
     }
   }
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <commits@geode.apache.org>'].