diff options
author | Yash Tibrewal <yashkt@google.com> | 2019-01-04 17:28:25 -0800 |
---|---|---|
committer | Yash Tibrewal <yashkt@google.com> | 2019-01-04 17:28:25 -0800 |
commit | 059459a9ee082538d79be65dda3a131ef634cef1 (patch) | |
tree | f375e509e895f0d11888c930d44fdaee6f62b8cb /src/python/grpcio_tests/tests/unit/_cython/_fork_test.py | |
parent | 6e5eb4e5a3276273d5cf6deb51b1835990ffea0f (diff) | |
parent | 6de81f54bbba10caa79fc72a253c0ea53fa05273 (diff) |
Merge branch 'master' into failhijackedrecv
Diffstat (limited to 'src/python/grpcio_tests/tests/unit/_cython/_fork_test.py')
-rw-r--r-- | src/python/grpcio_tests/tests/unit/_cython/_fork_test.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/python/grpcio_tests/tests/unit/_cython/_fork_test.py b/src/python/grpcio_tests/tests/unit/_cython/_fork_test.py index aeb02458a7..5a5dedd5f2 100644 --- a/src/python/grpcio_tests/tests/unit/_cython/_fork_test.py +++ b/src/python/grpcio_tests/tests/unit/_cython/_fork_test.py @@ -27,6 +27,7 @@ def _get_number_active_threads(): class ForkPosixTester(unittest.TestCase): def setUp(self): + self._saved_fork_support_flag = cygrpc._GRPC_ENABLE_FORK_SUPPORT cygrpc._GRPC_ENABLE_FORK_SUPPORT = True def testForkManagedThread(self): @@ -50,6 +51,9 @@ class ForkPosixTester(unittest.TestCase): thread.join() self.assertEqual(0, _get_number_active_threads()) + def tearDown(self): + cygrpc._GRPC_ENABLE_FORK_SUPPORT = self._saved_fork_support_flag + @unittest.skipUnless(os.name == 'nt', 'Windows-specific tests') class ForkWindowsTester(unittest.TestCase): |