This is an automated email from the ASF dual-hosted git repository.

gurwls223 pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/branch-2.4 by this push:
     new 20e46ef  [SPARK-28582][PYSPARK] Fix flaky test 
DaemonTests.do_termination_test which fail on Python 3.7
20e46ef is described below

commit 20e46ef6e3e49e754062717c2cb249c6eb99e86a
Author: WeichenXu <weichen...@databricks.com>
AuthorDate: Fri Aug 2 22:07:06 2019 +0900

    [SPARK-28582][PYSPARK] Fix flaky test DaemonTests.do_termination_test which 
fail on Python 3.7
    
    Fix flaky test DaemonTests.do_termination_test which fail on Python 3.7. I 
add a sleep after the test connection to daemon.
    
    Run test
    ```
    python/run-tests --python-executables=python3.7 --testname 
"pyspark.tests.test_daemon DaemonTests"
    ```
    **Before**
    Fail on test "test_termination_sigterm". And we can see daemon process do 
not exit.
    **After**
    Test passed
    
    Closes #25315 from WeichenXu123/fix_py37_daemon.
    
    Authored-by: WeichenXu <weichen...@databricks.com>
    Signed-off-by: HyukjinKwon <gurwls...@apache.org>
    (cherry picked from commit fbeee0c5bcea32346b2279c5b67044f12e5faf7d)
    Signed-off-by: HyukjinKwon <gurwls...@apache.org>
---
 python/pyspark/tests.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/python/pyspark/tests.py b/python/pyspark/tests.py
index a2d825b..fc0ed41 100644
--- a/python/pyspark/tests.py
+++ b/python/pyspark/tests.py
@@ -1939,9 +1939,12 @@ class DaemonTests(unittest.TestCase):
         # daemon should accept connections
         self.assertTrue(self.connect(port))
 
+        # wait worker process spawned from daemon exit.
+        time.sleep(1)
+
         # request shutdown
         terminator(daemon)
-        time.sleep(1)
+        daemon.wait(5)
 
         # daemon should no longer accept connections
         try:


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to