diff --git a/watchman/integration/lib/WatchmanTestCase.py b/watchman/integration/lib/WatchmanTestCase.py index b456a2cb959c..2de3e6ead460 100644 --- a/watchman/integration/lib/WatchmanTestCase.py +++ b/watchman/integration/lib/WatchmanTestCase.py @@ -575,7 +575,7 @@ def setDefaultConfiguration(self): except unittest.SkipTest: pass - for (transport, encoding, parallel, split, suffix) in matrix: + for transport, encoding, parallel, split, suffix in matrix: make_class(transport, encoding, suffix, parallel == "parallel", split) return None diff --git a/watchman/integration/test_dirname.py b/watchman/integration/test_dirname.py index 0adffe3d0a97..77667923ce8c 100644 --- a/watchman/integration/test_dirname.py +++ b/watchman/integration/test_dirname.py @@ -96,7 +96,7 @@ def test_dirname(self) -> None: ["1", 4, []], ] - for (dirname, depth, expect) in tests: + for dirname, depth, expect in tests: if depth is None: # equivalent to `depth ge 0` term = ["dirname", dirname] diff --git a/watchman/integration/test_size.py b/watchman/integration/test_size.py index 0f24a6f5ce10..29854e460f6b 100644 --- a/watchman/integration/test_size.py +++ b/watchman/integration/test_size.py @@ -35,7 +35,7 @@ def test_size_expr(self) -> None: ["lt", 3, ["empty"]], ] - for (op, operand, expect) in tests: + for op, operand, expect in tests: res = self.watchmanCommand( "query", root, {"expression": ["size", op, operand], "fields": ["name"]} ) diff --git a/watchman/python/tests/tests.py b/watchman/python/tests/tests.py index eed1c5ef9e87..d2637bf3f3b5 100755 --- a/watchman/python/tests/tests.py +++ b/watchman/python/tests/tests.py @@ -131,7 +131,7 @@ def expand_bser_mods(test_class): caller_scope = inspect.currentframe().f_back.f_locals flavors = [(bser, "Bser"), (pybser, "PyBser")] - for (mod, suffix) in flavors: + for mod, suffix in flavors: def make_class(mod, suffix): subclass_name = test_class.__name__ + suffix diff --git a/watchman/runtests.py b/watchman/runtests.py index 40b4fbdd7a0a..d5269c32f6d6 100755 --- a/watchman/runtests.py +++ b/watchman/runtests.py @@ -387,6 +387,7 @@ def loadTestsFromModule(self, module, *args, **kw): tls = threading.local() + # Manage printing from concurrent threads # http://stackoverflow.com/a/3030755/149111 class ThreadSafeFile: