From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 29 Aug 2012 21:29:08 +0000 (-0400)
Subject: oops, one more
X-Git-Tag: rel_0_8_0b1~189
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28be45cb54d63f8a2038f221a3a35580ff47f238;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

oops, one more
---

diff --git a/test/ext/declarative/test_mixin.py b/test/ext/declarative/test_mixin.py
index 7bc1e1d159..6c22333021 100644
--- a/test/ext/declarative/test_mixin.py
+++ b/test/ext/declarative/test_mixin.py
@@ -289,6 +289,8 @@ class DeclarativeMixinTest(DeclarativeTestBase):
         assert len(General.bar.prop.columns) == 1
         assert Specific.bar.prop is General.bar.prop
 
+    @testing.skip_if(lambda: testing.against('oracle'),
+                    "Test has an empty insert in it at the moment")
     def test_columns_single_inheritance_conflict_resolution(self):
         """Test that a declared_attr can return the existing column and it will
         be ignored.  this allows conditional columns to be added.