From 31fe30016ffb9e6e7e661d833f9fd4cf0a1fe2d2 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@pivotal.io>
Date: Sun, 31 Aug 2014 21:49:06 -0700
Subject: [PATCH] Fixed the failing test cases in the
 TemplateRegionsNamespaceTests test suite class when run in the Bamboo CI
 environment with mocking disabled. The failures were caused by inproperly
 configured collocated, Partitioned Regions with redundancy configured inside
 a GemFire data node. (cherry picked from commit
 b9dbd0a64ec35db0c7eea7f3af31766613ea086b)

Signed-off-by: John Blum <jblum@pivotal.io>
---
 .../config/TemplateRegionsNamespaceTests-context.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/test/resources/org/springframework/data/gemfire/config/TemplateRegionsNamespaceTests-context.xml b/src/test/resources/org/springframework/data/gemfire/config/TemplateRegionsNamespaceTests-context.xml
index b577711d..fc8b6ec3 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/TemplateRegionsNamespaceTests-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/TemplateRegionsNamespaceTests-context.xml
@@ -2,13 +2,21 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:gfe="http://www.springframework.org/schema/gemfire"
 	   xmlns:p="http://www.springframework.org/schema/p"
+	   xmlns:util="http://www.springframework.org/schema/util"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 	   	http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
 ">
 
-	<gfe:cache/>
+	<util:properties id="gemfireProperties">
+		<prop key="name">TemplateRegionsNamespaceTest</prop>
+		<prop key="mcast-port">0</prop>
+		<prop key="log-level">warning</prop>
+	</util:properties>
+
+	<gfe:cache properties-ref="gemfireProperties"/>
 
 	<gfe:async-event-queue id="TestAsyncEventQueue" persistent="false" parallel="true" dispatcher-threads="4">
 		<gfe:async-event-listener>
@@ -106,7 +114,7 @@
 		<gfe:subscription type="ALL"/>
 	</gfe:partitioned-region>
 
-	<gfe:partitioned-region id="Neighbor" persistent="false"/>
+	<gfe:partitioned-region id="Neighbor" persistent="true" copies="2" total-buckets="91"/>
 
 	<!-- LOCAL Region -->