Skip to content

Commit 126bbd9

Browse files
committed
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)
1 parent b3d6693 commit 126bbd9

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

test_proxy.py

100644100755
Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@
22
# -*- coding: utf-8 -*-
33

44
from proxy import Proxy, NoTalkProxy
5-
from io import StringIO
65
import sys
76
from time import time
87

8+
if sys.version_info[0] == 2:
9+
from StringIO import StringIO
10+
else:
11+
from io import StringIO
12+
913
if sys.version_info < (2, 7):
1014
import unittest2 as unittest
1115
else:
@@ -40,8 +44,8 @@ def test_sales_manager_shall_talk_through_proxy_with_delay(cls):
4044
expected_print_output = 'Proxy checking for Sales Manager availability\n\
4145
Sales Manager ready to talk\n'
4246
cls.assertEqual(print_output, expected_print_output)
43-
expected_execution_time = 2
44-
cls.assertEqual(int(execution_time), expected_execution_time)
47+
expected_execution_time = 1
48+
cls.assertEqual(int(execution_time*10), expected_execution_time)
4549

4650
def test_sales_manager_shall_respond_through_proxy_with_delay(cls):
4751
cls.p.busy = 'Yes'
@@ -53,8 +57,8 @@ def test_sales_manager_shall_respond_through_proxy_with_delay(cls):
5357
expected_print_output = 'Proxy checking for Sales Manager availability\n\
5458
Sales Manager is busy\n'
5559
cls.assertEqual(print_output, expected_print_output)
56-
expected_execution_time = 2
57-
cls.assertEqual(int(execution_time), expected_execution_time)
60+
expected_execution_time = 1
61+
cls.assertEqual(int(execution_time*10), expected_execution_time)
5862

5963

6064
class NoTalkProxyTest(unittest.TestCase):
@@ -85,8 +89,8 @@ def test_sales_manager_shall_not_talk_through_proxy_with_delay(cls):
8589
expected_print_output = 'Proxy checking for Sales Manager availability\n\
8690
This Sales Manager will not talk to you whether he/she is busy or not\n'
8791
cls.assertEqual(print_output, expected_print_output)
88-
expected_execution_time = 2
89-
cls.assertEqual(int(execution_time), expected_execution_time)
92+
expected_execution_time = 1
93+
cls.assertEqual(int(execution_time*10), expected_execution_time)
9094

9195
def test_sales_manager_shall_not_respond_through_proxy_with_delay(cls):
9296
cls.ntp.busy = 'Yes'
@@ -98,8 +102,8 @@ def test_sales_manager_shall_not_respond_through_proxy_with_delay(cls):
98102
expected_print_output = 'Proxy checking for Sales Manager availability\n\
99103
This Sales Manager will not talk to you whether he/she is busy or not\n'
100104
cls.assertEqual(print_output, expected_print_output)
101-
expected_execution_time = 2
102-
cls.assertEqual(int(execution_time), expected_execution_time)
105+
expected_execution_time = 1
106+
cls.assertEqual(int(execution_time*10), expected_execution_time)
103107

104108
if __name__ == "__main__":
105109
unittest.main()

0 commit comments

Comments
 (0)