From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 29 Aug 2012 20:25:20 +0000 (-0400)
Subject: - skip this on oracle
X-Git-Tag: rel_0_8_0b1~190
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=561c71ff5540d92bd82c31f49848d75c77906356;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- skip this on oracle
---

diff --git a/test/ext/declarative/test_inheritance.py b/test/ext/declarative/test_inheritance.py
index 7a2cb2deff..86bd1c28e3 100644
--- a/test/ext/declarative/test_inheritance.py
+++ b/test/ext/declarative/test_inheritance.py
@@ -478,6 +478,8 @@ class DeclarativeInheritanceTest(DeclarativeTestBase):
         eq_(sess.query(Engineer).filter_by(primary_language='cobol'
             ).one(), Engineer(name='vlad', primary_language='cobol'))
 
+    @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.