From c1a4a800a81d480d1e646e98ca7015fcfdd44673 Mon Sep 17 00:00:00 2001
From: Julien Muchembled <jm@nexedi.com>
Date: Sat, 20 Nov 2010 02:39:54 +0000
Subject: [PATCH] TestConflictResolution: install 'erp5_base' for
 'portal_web_services'

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40430 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 product/ERP5/tests/testConflictResolution.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/product/ERP5/tests/testConflictResolution.py b/product/ERP5/tests/testConflictResolution.py
index 1af01d50c2..cb9629b90f 100644
--- a/product/ERP5/tests/testConflictResolution.py
+++ b/product/ERP5/tests/testConflictResolution.py
@@ -36,6 +36,9 @@ class TestConflictResolution(ERP5TypeTestCase):
   def getTitle(self):
     return "Conflict Resolution"
 
+  def getBusinessTemplateList(self):
+    return ('erp5_base',)
+
   def afterSetUp(self):
     other_node = self.getOtherZEOClientNode()
     self.other_node = self.portal.portal_web_services.connect(
-- 
2.30.9