Pārlūkot izejas kodu

Revert "[core] Thrift calls can hang forever in the unit tests"

This reverts commit 895e408e2eac6559f8d6aa5e0c186c9c5c77409e.
Romain Rigaux 13 gadi atpakaļ
vecāks
revīzija
562585c

+ 0 - 1
apps/beeswax/src/beeswax/test_base.py

@@ -94,7 +94,6 @@ def get_shared_beeswax_server():
       beeswax.conf.BEESWAX_SERVER_PORT.set_for_testing(BEESWAXD_TEST_PORT),
       beeswax.conf.BEESWAX_META_SERVER_HOST.set_for_testing("localhost"),
       beeswax.conf.BEESWAX_META_SERVER_PORT.set_for_testing(BEESWAXD_TEST_PORT + 1),
-      beeswax.conf.BEESWAX_SERVER_CONN_TIMEOUT.set_for_testing(10),
       # Use a bogus path to avoid loading the normal hive-site.xml
       beeswax.conf.BEESWAX_HIVE_CONF_DIR.set_for_testing('/my/bogus/path')
     )

+ 0 - 3
desktop/core/src/desktop/lib/thrift_util_test.py

@@ -39,7 +39,6 @@ from thrift.transport import TSocket
 from thrift.transport.TTransport import TBufferedTransportFactory
 
 from nose.tools import assert_equal
-from nose.plugins.skip import SkipTest
 
 
 class SimpleThriftServer(object):
@@ -85,7 +84,6 @@ class SimpleThriftServer(object):
       logging.info("Waiting for service to come online")
       try:
         ping_s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        ping_s.settimeout(5)
         ping_s.connect(('localhost', self.port))
         ping_s.close()
         return
@@ -128,7 +126,6 @@ class TestWithThriftServer(object):
     cls.server.stop_server_process()
 
   def test_basic_operation(self):
-    raise SkipTest
     assert_equal(10, self.client.ping(5))
 
   def test_connection_race(self):