merge default

1 files changed, 22 insertions, 2 deletions

diff --git a/test/base/test_utils.py b/test/base/test_utils.py
index b9f94c603..194ef1222 100644
--- a/test/base/test_utils.py
+++ b/test/base/test_utils.py
@@ -1083,6 +1083,10 @@ class ArgInspectionTest(fixtures.TestBase):
             def __init__(self, b1, **kw):
                 pass
 
+        class B2(B):
+            def __init__(self, b2):
+                pass
+
         class AB(A, B):
             def __init__(self, ab):
                 pass
@@ -1100,15 +1104,27 @@ class ArgInspectionTest(fixtures.TestBase):
         class CBA(B, A):
             pass
 
+        class CB1A1(B1, A1):
+            pass
+
         class CAB1(A, B1):
             pass
 
         class CB1A(B1, A):
             pass
 
+        class CB2A(B2, A):
+            pass
+
         class D(object):
             pass
 
+        class BA2(B, A):
+            pass
+
+        class A11B1(A11, B1):
+            pass
+
         def test(cls, *expected):
             eq_(set(util.get_cls_kwargs(cls)), set(expected))
 
@@ -1121,10 +1137,14 @@ class ArgInspectionTest(fixtures.TestBase):
         test(BA, 'ba', 'b', 'a')
         test(BA1, 'ba', 'b', 'a')
         test(CAB, 'a')
-        test(CBA, 'b')
+        test(CBA, 'b', 'a')
         test(CAB1, 'a')
-        test(CB1A, 'b1', 'b')
+        test(CB1A, 'b1', 'b', 'a')
+        test(CB2A, 'b2')
+        test(CB1A1, "a1", "b1", "b")
         test(D)
+        test(BA2, "a", "b")
+        test(A11B1, "a1", "a11", "b", "b1")
 
     def test_get_func_kwargs(self):