continue attempting to get proper count for pybot on 2.5, ensure order_by for oracle...

diff --git a/test/dialect/oracle.py b/test/dialect/oracle.py
index fda6f3549f63a4adbc2c4bf4f07bed46db69e131..4e9960012b14c146ebf73a747128fb174e6e5cd7 100644 (file)
--- a/test/dialect/oracle.py
+++ b/test/dialect/oracle.py
@@ -126,7 +126,7 @@ AND mytable.myid = myothertable.otherid(+)",
         self.assert_compile(query.select(), "SELECT mytable.myid, mytable.name, mytable.description, myothertable.otherid, myothertable.othername, thirdtable.userid, thirdtable.otherstuff FROM mytable, myothertable, thirdtable WHERE mytable.myid = myothertable.otherid AND thirdtable.userid = myothertable.otherid", dialect=oracle.dialect(use_ansi=False))
 
         query = table1.join(table2, table1.c.myid==table2.c.otherid).outerjoin(table3, table3.c.userid==table2.c.otherid)
-        self.assert_compile(query.select().limit(10).offset(5), "SELECT myid, name, description, otherid, othername, userid, \
+        self.assert_compile(query.select().order_by(table1.oid_column).limit(10).offset(5), "SELECT myid, name, description, otherid, othername, userid, \
 otherstuff FROM (SELECT mytable.myid AS myid, mytable.name AS name, \
 mytable.description AS description, myothertable.otherid AS otherid, \
 myothertable.othername AS othername, thirdtable.userid AS userid, \

diff --git a/test/profiling/compiler.py b/test/profiling/compiler.py
index 0ce0e7792c32053bc661c8f66f0bd8982fbd9fed..23e199962ff0161747ffbb4570ba7231f774ab03 100644 (file)
--- a/test/profiling/compiler.py
+++ b/test/profiling/compiler.py
@@ -24,7 +24,7 @@ class CompileTest(TestBase, AssertsExecutionResults):
         t1.update().compile()
 
     # TODO: this is alittle high
-    @profiling.function_call_count(125, versions={'2.3': 180, '2.4':140})
+    @profiling.function_call_count(130, versions={'2.3': 180, '2.4':140})
     def test_select(self):
         s = select([t1], t1.c.c2==t2.c.c1)
         s.compile()