brizental pushed to branch tor-browser-153.0a1-16.0-2 at The Tor Project / Applications / Tor Browser

Commits:

2 changed files:

Changes:

  • testing/mozbase/manifestparser/manifestparser/filters.py
    ... ... @@ -361,7 +361,7 @@ class tags(InstanceFilter):
    361 361
         """
    
    362 362
         Removes tests that don't contain any of the given tags. This overrides
    
    363 363
         InstanceFilter's __eq__ method, so multiple instances can be added.
    
    364
    -    Multiple tag filters is equivalent to joining tags with the AND operator.
    
    364
    +    Multiple tag filters is equivalent to joining tags with the OR operator.
    
    365 365
     
    
    366 366
         To define a tag in a manifest, add a `tags` attribute to a test or DEFAULT
    
    367 367
         section. Tests can have multiple tags, in which case they should be
    

  • testing/xpcshell/runxpcshelltests.py
    ... ... @@ -1281,7 +1281,7 @@ class XPCShellTests:
    1281 1281
     
    
    1282 1282
             filters = []
    
    1283 1283
             if test_tags:
    
    1284
    -            filters.extend([tags(x) for x in test_tags])
    
    1284
    +            filters.append(tags(test_tags))
    
    1285 1285
     
    
    1286 1286
             path_filter = None
    
    1287 1287
             if test_paths: