[test] Enable test category for inline tests.

[JDevlieghere]

Summary

Inlined tests have a test function that is actually an instance method,
which requires a slightly different approach when it comes to setting
the category attribute. The attribute must be set on the actual
function, rather than on a particular instance.

[davide]

thanks for fixing this.

lldb/packages/Python/lldbsuite/test/decorators.py

529

We should consider clang-formatting this file altogether.

[JDevlieghere]

Forgot to add the differential to the commit message. Landed in rL324488

[labath]

lldb/packages/Python/lldbsuite/test/decorators.py

306–307

These two lines look like they need to be fixed as well.

529

The current (weird) formatting is the result of running autopep8 as a part of the huge refactor some time ago...

[JDevlieghere]

The change in r324488 dropped the existing category attribute in for
instance methods. This patch corrects that.

[vsk]

Ah, I see the first part landed in rL324488 and this is a follow-up.

[vsk]

This lgtm Jonas, thank you!

[JDevlieghere]

Jup. Sorry for making it so confusing. Because Pavel's reply was here it seemed sensible to update the diff.

Landed in rL324492

lldb/packages/Python/lldbsuite/test/decorators.py

 
 def add_test_categories(cat):
     """Add test categories to a TestCase method"""
     cat = test_categories.validate(cat, True)
 
     def impl(func):
         if isinstance(func, type) and issubclass(func, unittest2.TestCase):
             raise Exception(
                 "@add_test_categories can only be used to decorate a test method")
-        if hasattr(func, "categories"):
-            cat.extend(func.categories)
-        # For instance methods, the attribute must be set on the actual function.
-        if inspect.ismethod(func):
-            func.__func__.categories = cat
-        else:
-            func.categories = cat
+
+        # Update or set the categories attribute. For instance methods, the
+        # attribute must be set on the actual function.
+        func_for_attr = func
+        if inspect.ismethod(func_for_attr):
+            func_for_attr = func.__func__
+        if hasattr(func_for_attr, "categories"):
+            cat.extend(func_for_attr.categories)
+        setattr(func_for_attr, "categories", cat)
+
         return func
 
     return impl
 
 
 def benchmarks_test(func):
     """Decorate the item as a benchmarks test."""
     def should_skip_benchmarks_test():
def are_sb_headers_missing():
                 os.environ["LLDB_LIB_DIR"],
                 'LLDB.framework',
                 'Versions',
                 'Current',
                 'Headers',
                 'LLDB.h')
             if os.path.exists(header):
                 return None
 
         header = os.path.join(
             os.environ["LLDB_SRC"],
             "include",
             "lldb",
             "API",
             "LLDB.h")
         if not os.path.exists(header):
             return "skip because LLDB.h header not found"