Skip to content
This repository
Browse code

macos-fix-xlog_rpl: somehow python subprocess.wait act broken

under Mac OS (unreasonable stalls), changing to the subprocess.communicate with the same
functonality
  • Loading branch information...
commit 962a7c3af77a53a1ee656a9016037e5ee42e4110 1 parent 8bf2a88
Dmitry Simonenko authored July 09, 2012

Showing 1 changed file with 4 additions and 6 deletions. Show diff stats Hide diff stats

  1. 10  test/connector_c/xlog_rpl.test
10  test/connector_c/xlog_rpl.test
@@ -7,9 +7,8 @@ from lib.tarantool_box_server import TarantoolBoxServer
7 7
 p = subprocess.Popen([os.path.join(builddir, "test/connector_c/xlog"),
8 8
 		      os.path.join(builddir, "test/connector_c/connector.xlog")],
9 9
                      stdout=subprocess.PIPE)
10  
-p.wait()
11  
-for line in p.stdout.readlines():
12  
-      sys.stdout.write(line)
  10
+o,e = p.communicate()
  11
+sys.stdout.write(o)
13 12
 
14 13
 server.stop()
15 14
 server.deploy("connector_c/cfg/master.cfg")
@@ -25,9 +24,8 @@ print ""
25 24
 p = subprocess.Popen([os.path.join(builddir, "test/connector_c/rpl"),
26 25
 		     "127.0.0.1", "33016", "1200"],
27 26
                      stdout=subprocess.PIPE)
28  
-p.wait()
29  
-for line in p.stdout.readlines():
30  
-      sys.stdout.write(line)
  27
+o,e = p.communicate()
  28
+sys.stdout.write(o)
31 29
 
32 30
 server.stop()
33 31
 server.deploy()

0 notes on commit 962a7c3

Please sign in to comment.
Something went wrong with that request. Please try again.