diff --git a/python-tornado.changes b/python-tornado.changes index c9204f3..1326054 100644 --- a/python-tornado.changes +++ b/python-tornado.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 16 14:46:55 CET 2018 - ro@suse.de + +- add tornado-testsuite_timeout.patch (bsc#1085661) + extend timeouts in testsuite to allow successful build on ppc64le + ------------------------------------------------------------------- Wed Mar 7 15:38:39 UTC 2018 - aplanas@suse.com diff --git a/python-tornado.spec b/python-tornado.spec index 43c0238..ce2e03d 100644 --- a/python-tornado.spec +++ b/python-tornado.spec @@ -27,6 +27,7 @@ Group: Development/Languages/Python Url: http://www.tornadoweb.org Source: https://files.pythonhosted.org/packages/source/t/tornado/tornado-%{version}.tar.gz Patch0: tornado-async-deprecations.patch +Patch1: tornado-testsuite_timeout.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module pycurl} BuildRequires: %{python_module setuptools} @@ -84,6 +85,7 @@ thousands of clients, see The C10K problem.) # Fix non-executable script rpmlint issue: find demos tornado -name "*.py" -exec sed -i "/#\!\/usr\/bin\/.*/d" {} \; %patch0 -p1 +%patch1 -p1 %pre # remove egg-info _file_, being replaced by an egg-info directory diff --git a/tornado-testsuite_timeout.patch b/tornado-testsuite_timeout.patch new file mode 100644 index 0000000..092be36 --- /dev/null +++ b/tornado-testsuite_timeout.patch @@ -0,0 +1,49 @@ +--- tornado-4.5.3/tornado/test/simple_httpclient_test.py 2018/03/16 13:18:41 1.1 ++++ tornado-4.5.3/tornado/test/simple_httpclient_test.py 2018/03/16 13:41:14 +@@ -239,7 +239,7 @@ + @skipOnTravis + def test_connect_timeout(self): + timeout = 0.1 +- timeout_min, timeout_max = 0.099, 1.0 ++ timeout_min, timeout_max = 0.099, 3.0 + + class TimeoutResolver(Resolver): + def resolve(self, *args, **kwargs): +@@ -257,7 +257,7 @@ + @skipOnTravis + def test_request_timeout(self): + timeout = 0.1 +- timeout_min, timeout_max = 0.099, 0.15 ++ timeout_min, timeout_max = 0.099, 0.25 + if os.name == 'nt': + timeout = 0.5 + timeout_min, timeout_max = 0.4, 0.6 +@@ -360,7 +360,7 @@ + response = self.wait() + + self.assertEqual(response.code, 599) +- self.assertTrue(response.request_time < 1, response.request_time) ++ self.assertTrue(response.request_time < 2.5, response.request_time) + self.assertEqual(str(response.error), "HTTP 599: Timeout in request queue") + self.triggers.popleft()() + self.wait() +--- tornado-4.5.3/tornado/test/testing_test.py 2018/03/16 13:18:44 1.1 ++++ tornado-4.5.3/tornado/test/testing_test.py 2018/03/16 13:18:56 +@@ -61,7 +61,7 @@ + self.io_loop.add_timeout(self.io_loop.time() + 0.00, self.stop) + self.wait(timeout=0.02) + self.io_loop.add_timeout(self.io_loop.time() + 0.03, self.stop) +- self.wait(timeout=0.15) ++ self.wait(timeout=0.25) + + def test_multiple_errors(self): + def fail(message): +@@ -206,7 +206,7 @@ + self.finished = True + + def test_timeout_environment_variable(self): +- @gen_test(timeout=0.5) ++ @gen_test(timeout=0.9) + def test_long_timeout(self): + time = self.io_loop.time + yield gen.Task(self.io_loop.add_timeout, time() + 0.25)