--- a/devtools/repotest.py Thu May 14 10:24:56 2009 +0200
+++ b/devtools/repotest.py Thu May 14 11:38:40 2009 +0200
@@ -103,7 +103,7 @@
class RQLGeneratorTC(TestCase):
schema = None # set this in concret test
-
+
def setUp(self):
self.rqlhelper = RQLHelper(self.schema, special_relations={'eid': 'uid',
'has_text': 'fti'})
@@ -114,7 +114,7 @@
def tearDown(self):
ExecutionPlan._check_permissions = _orig_check_permissions
rqlannotation._select_principal = _orig_select_principal
-
+
def _prepare(self, rql):
#print '******************** prepare', rql
union = self.rqlhelper.parse(rql)
@@ -133,7 +133,7 @@
class BaseQuerierTC(TestCase):
repo = None # set this in concret test
-
+
def setUp(self):
self.o = self.repo.querier
self.session = self.repo._sessions.values()[0]
@@ -148,7 +148,7 @@
return self.session.unsafe_execute('Any MAX(X)')[0][0]
def cleanup(self):
self.session.unsafe_execute('DELETE Any X WHERE X eid > %s' % self.maxeid)
-
+
def tearDown(self):
undo_monkey_patch()
self.session.rollback()
@@ -159,7 +159,7 @@
def set_debug(self, debug):
set_debug(debug)
-
+
def _rqlhelper(self):
rqlhelper = self.o._rqlhelper
# reset uid_func so it don't try to get type from eids
@@ -175,8 +175,8 @@
for select in rqlst.children:
select.solutions.sort()
return self.o.plan_factory(rqlst, kwargs, self.session)
-
- def _prepare(self, rql, kwargs=None):
+
+ def _prepare(self, rql, kwargs=None):
plan = self._prepare_plan(rql, kwargs)
plan.preprocess(plan.rqlst)
rqlst = plan.rqlst.children[0]
@@ -195,10 +195,10 @@
def execute(self, rql, args=None, eid_key=None, build_descr=True):
return self.o.execute(self.session, rql, args, eid_key, build_descr)
-
+
def commit(self):
self.session.commit()
- self.session.set_pool()
+ self.session.set_pool()
class BasePlannerTC(BaseQuerierTC):
@@ -270,7 +270,7 @@
def merge_input_maps(self, *args):
pass
def _choose_term(self, sourceterms):
- pass
+ pass
_orig_merge_input_maps = PartPlanInformation.merge_input_maps
_orig_choose_term = PartPlanInformation._choose_term
@@ -309,4 +309,3 @@
ExecutionPlan.init_temp_table = _orig_init_temp_table
PartPlanInformation.merge_input_maps = _orig_merge_input_maps
PartPlanInformation._choose_term = _orig_choose_term
-