BF(TST): fixing test_proxy for recent decrease of sleep, but also py version specific import of StringIO (breaks on 2.x with io.StringIO)

Author: yarikoptic

test_proxy.py

@@ -2,10 +2,14 @@
 # -*- coding: utf-8 -*-
 
 fromproxyimportProxy, NoTalkProxy
-fromioimportStringIO
 importsys
 fromtimeimporttime
 
+ifsys.version_info[0] ==2:
+fromStringIOimportStringIO
+else:
+fromioimportStringIO
+
 ifsys.version_info< (2, 7):
 importunittest2asunittest
 else:
@@ -40,8 +44,8 @@ def test_sales_manager_shall_talk_through_proxy_with_delay(cls):
 expected_print_output='Proxy checking for Sales Manager availability\n\
 Sales Manager ready to talk\n'
 cls.assertEqual(print_output, expected_print_output)
-expected_execution_time=2
-cls.assertEqual(int(execution_time), expected_execution_time)
+expected_execution_time=1
+cls.assertEqual(int(execution_time*10), expected_execution_time)
 
 deftest_sales_manager_shall_respond_through_proxy_with_delay(cls):
 cls.p.busy='Yes'
@@ -53,8 +57,8 @@ def test_sales_manager_shall_respond_through_proxy_with_delay(cls):
 expected_print_output='Proxy checking for Sales Manager availability\n\
 Sales Manager is busy\n'
 cls.assertEqual(print_output, expected_print_output)
-expected_execution_time=2
-cls.assertEqual(int(execution_time), expected_execution_time)
+expected_execution_time=1
+cls.assertEqual(int(execution_time*10), expected_execution_time)
 
 
 classNoTalkProxyTest(unittest.TestCase):
@@ -85,8 +89,8 @@ def test_sales_manager_shall_not_talk_through_proxy_with_delay(cls):
 expected_print_output='Proxy checking for Sales Manager availability\n\
 This Sales Manager will not talk to you whether he/she is busy or not\n'
 cls.assertEqual(print_output, expected_print_output)
-expected_execution_time=2
-cls.assertEqual(int(execution_time), expected_execution_time)
+expected_execution_time=1
+cls.assertEqual(int(execution_time*10), expected_execution_time)
 
 deftest_sales_manager_shall_not_respond_through_proxy_with_delay(cls):
 cls.ntp.busy='Yes'
@@ -98,8 +102,8 @@ def test_sales_manager_shall_not_respond_through_proxy_with_delay(cls):
 expected_print_output='Proxy checking for Sales Manager availability\n\
 This Sales Manager will not talk to you whether he/she is busy or not\n'
 cls.assertEqual(print_output, expected_print_output)
-expected_execution_time=2
-cls.assertEqual(int(execution_time), expected_execution_time)
+expected_execution_time=1
+cls.assertEqual(int(execution_time*10), expected_execution_time)
 
 if__name__=="__main__":
 unittest.main()