[spark] branch branch-2.4 updated: Revert "[SPARK-28582][PYSPARK] Fix flaky test DaemonTests.do_termination_test which fail on Python 3.7"

2019-08-02 Thread dongjoon
This is an automated email from the ASF dual-hosted git repository.

dongjoon 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 fe0f53a  Revert "[SPARK-28582][PYSPARK] Fix flaky test 
DaemonTests.do_termination_test which fail on Python 3.7"
fe0f53a is described below

commit fe0f53ae4e4a71ebb821506af7e7f0ba7690dc53
Author: Dongjoon Hyun 
AuthorDate: Fri Aug 2 10:08:29 2019 -0700

Revert "[SPARK-28582][PYSPARK] Fix flaky test 
DaemonTests.do_termination_test which fail on Python 3.7"

This reverts commit 20e46ef6e3e49e754062717c2cb249c6eb99e86a.
---
 python/pyspark/tests.py | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/python/pyspark/tests.py b/python/pyspark/tests.py
index fc0ed41..a2d825b 100644
--- a/python/pyspark/tests.py
+++ b/python/pyspark/tests.py
@@ -1939,12 +1939,9 @@ 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)
-daemon.wait(5)
+time.sleep(1)
 
 # 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



[spark] branch branch-2.4 updated: Revert "[SPARK-28582][PYSPARK] Fix flaky test DaemonTests.do_termination_test which fail on Python 3.7"

2019-08-02 Thread gurwls223
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 a065a50  Revert "[SPARK-28582][PYSPARK] Fix flaky test 
DaemonTests.do_termination_test which fail on Python 3.7"
a065a50 is described below

commit a065a503bcf1ec5b7d49c575af7bc6867c734d90
Author: HyukjinKwon 
AuthorDate: Fri Aug 2 22:12:04 2019 +0900

Revert "[SPARK-28582][PYSPARK] Fix flaky test 
DaemonTests.do_termination_test which fail on Python 3.7"

This reverts commit dc09a02c142d3787e728c8b25eb8417649d98e9f.
---
 python/pyspark/tests.py | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/python/pyspark/tests.py b/python/pyspark/tests.py
index fef2959..a2d825b 100644
--- a/python/pyspark/tests.py
+++ b/python/pyspark/tests.py
@@ -1916,7 +1916,7 @@ class OutputFormatTests(ReusedPySparkTestCase):
 
 class DaemonTests(unittest.TestCase):
 def connect(self, port):
-from socket import socket, AF_INET, SOCK_STREAM# request shutdown
+from socket import socket, AF_INET, SOCK_STREAM
 sock = socket(AF_INET, SOCK_STREAM)
 sock.connect(('127.0.0.1', port))
 # send a split index of -1 to shutdown the worker
@@ -1939,12 +1939,9 @@ 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)
-daemon.wait(5)
+time.sleep(1)
 
 # 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