[Lldb-commits] [PATCH] D67791: dotest.py: bugfix: test filters with -f do not work on Python3

[Jonas Devlieghere via Phabricator via lldb-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL372441: dotest.py: bugfix: test filters with -f do not work 
on Python3 (authored by JDevlieghere, committed by ).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Changed prior to commit:
  https://reviews.llvm.org/D67791?vs=220941&id=221135#toc

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D67791/new/

https://reviews.llvm.org/D67791

Files:
  lldb/trunk/third_party/Python/module/unittest2/unittest2/loader.py


Index: lldb/trunk/third_party/Python/module/unittest2/unittest2/loader.py
===================================================================
--- lldb/trunk/third_party/Python/module/unittest2/unittest2/loader.py
+++ lldb/trunk/third_party/Python/module/unittest2/unittest2/loader.py
@@ -117,7 +117,7 @@
             return self.loadTestsFromModule(obj)
         elif isinstance(obj, type) and issubclass(obj, unittest.TestCase):
             return self.loadTestsFromTestCase(obj)
-        elif (isinstance(obj, types.UnboundMethodType) and
+        elif (isinstance(obj, (types.MethodType, types.FunctionType)) and
               isinstance(parent, type) and
               issubclass(parent, case.TestCase)):
             return self.suiteClass([parent(obj.__name__)])



Index: lldb/trunk/third_party/Python/module/unittest2/unittest2/loader.py
===================================================================
--- lldb/trunk/third_party/Python/module/unittest2/unittest2/loader.py
+++ lldb/trunk/third_party/Python/module/unittest2/unittest2/loader.py
@@ -117,7 +117,7 @@
             return self.loadTestsFromModule(obj)
         elif isinstance(obj, type) and issubclass(obj, unittest.TestCase):
             return self.loadTestsFromTestCase(obj)
-        elif (isinstance(obj, types.UnboundMethodType) and
+        elif (isinstance(obj, (types.MethodType, types.FunctionType)) and
               isinstance(parent, type) and
               issubclass(parent, case.TestCase)):
             return self.suiteClass([parent(obj.__name__)])

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits