Merge branch 'master' into ticket_2501

1 files changed, 4 insertions, 2 deletions

diff --git a/test/sql/test_query.py b/test/sql/test_query.py
index ae029b11c..39c896266 100644
--- a/test/sql/test_query.py
+++ b/test/sql/test_query.py
@@ -52,11 +52,11 @@ class QueryTest(fixtures.TestBase):
     def test_multivalues_insert(self):
         users.insert(values=[{'user_id':7, 'user_name':'jack'},
             {'user_id':8, 'user_name':'ed'}]).execute()
-        rows = users.select().execute().fetchall()
+        rows = users.select().order_by(users.c.user_id).execute().fetchall()
         self.assert_(rows[0] == (7, 'jack'))
         self.assert_(rows[1] == (8, 'ed'))
         users.insert(values=[(9, 'jack'), (10, 'ed')]).execute()
-        rows = users.select().execute().fetchall()
+        rows = users.select().order_by(users.c.user_id).execute().fetchall()
         self.assert_(rows[2] == (9, 'jack'))
         self.assert_(rows[3] == (10, 'ed'))
 
@@ -1370,6 +1370,8 @@ class TableInsertTest(fixtures.TablesTest):
             inserted_primary_key=[1]
         )
 
+    @testing.crashes("mssql+pyodbc",
+            "Pyodbc + SQL Server + Py3K, some decimal handling issue")
     def test_uppercase_inline_implicit(self):
         t = self.tables.foo
         self._test(