dependencies: bumped pytest libraries to latest versions.

pkgs/python-packages.nix

@@ -757,13 +757,13 b''
     };
   };
   gprof2dot = super.buildPythonPackage {
-    name = "gprof2dot-2015.12.1";
+    name = "gprof2dot-2016.10.13";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/b9/34/7bf93c1952d40fa5c95ad963f4d8344b61ef58558632402eca18e6c14127/gprof2dot-2015.12.1.tar.gz";
-      md5 = "e23bf4e2f94db032750c193384b4165b";
+      url = "https://pypi.python.org/packages/a0/e0/73c71baed306f0402a00a94ffc7b2be94ad1296dfcb8b46912655b93154c/gprof2dot-2016.10.13.tar.gz";
+      md5 = "0125401f15fd2afe1df686a76c64a4fd";
     };
     meta = {
       license = [ { fullName = "LGPL"; } ];
@@ -1108,13 +1108,13 b''
     };
   };
   py = super.buildPythonPackage {
-    name = "py-1.4.29";
+    name = "py-1.4.31";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/2a/bc/a1a4a332ac10069b8e5e25136a35e08a03f01fd6ab03d819889d79a1fd65/py-1.4.29.tar.gz";
-      md5 = "c28e0accba523a29b35a48bb703fb96c";
+      url = "https://pypi.python.org/packages/f4/9a/8dfda23f36600dd701c6722316ba8a3ab4b990261f83e7d3ffc6dfedf7ef/py-1.4.31.tar.gz";
+      md5 = "5d2c63c56dc3f2115ec35c066ecd582b";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1290,13 +1290,13 b''
     };
   };
   pytest = super.buildPythonPackage {
-    name = "pytest-2.8.5";
+    name = "pytest-3.0.5";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [py];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/b1/3d/d7ea9b0c51e0cacded856e49859f0a13452747491e842c236bbab3714afe/pytest-2.8.5.zip";
-      md5 = "8493b06f700862f1294298d6c1b715a9";
+      url = "https://pypi.python.org/packages/a8/87/b7ca49efe52d2b4169f2bfc49aa5e384173c4619ea8e635f123a0dac5b75/pytest-3.0.5.tar.gz";
+      md5 = "cefd527b59332688bf5db4a10aa8a7cb";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
@@ -1316,52 +1316,52 b''
     };
   };
   pytest-cov = super.buildPythonPackage {
-    name = "pytest-cov-1.8.1";
+    name = "pytest-cov-2.4.0";
     buildInputs = with self; [];
     doCheck = false;
-    propagatedBuildInputs = with self; [py pytest coverage cov-core];
+    propagatedBuildInputs = with self; [pytest coverage];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/11/4b/b04646e97f1721878eb21e9f779102d84dd044d324382263b1770a3e4838/pytest-cov-1.8.1.tar.gz";
-      md5 = "76c778afa2494088270348be42d759fc";
+      url = "https://pypi.python.org/packages/00/c0/2bfd1fcdb9d407b8ac8185b1cb5ff458105c6b207a9a7f0e13032de9828f/pytest-cov-2.4.0.tar.gz";
+      md5 = "2fda09677d232acc99ec1b3c5831e33f";
     };
     meta = {
-      license = [ pkgs.lib.licenses.mit ];
+      license = [ pkgs.lib.licenses.bsdOriginal pkgs.lib.licenses.mit ];
     };
   };
   pytest-profiling = super.buildPythonPackage {
-    name = "pytest-profiling-1.0.1";
+    name = "pytest-profiling-1.2.2";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [six pytest gprof2dot];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/d8/67/8ffab73406e22870e07fa4dc8dce1d7689b26dba8efd00161c9b6fc01ec0/pytest-profiling-1.0.1.tar.gz";
-      md5 = "354404eb5b3fd4dc5eb7fffbb3d9b68b";
+      url = "https://pypi.python.org/packages/73/e8/804681323bac0bc45c520ec34185ba8469008942266d0074699b204835c1/pytest-profiling-1.2.2.tar.gz";
+      md5 = "0a16d7dda2d23b91e9730fa4558cf728";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
   pytest-runner = super.buildPythonPackage {
-    name = "pytest-runner-2.7.1";
+    name = "pytest-runner-2.9";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/99/6b/c4ff4418d3424d4475b7af60724fd4a5cdd91ed8e489dc9443281f0052bc/pytest-runner-2.7.1.tar.gz";
-      md5 = "e56f0bc8d79a6bd91772b44ef4215c7e";
+      url = "https://pypi.python.org/packages/11/d4/c335ddf94463e451109e3494e909765c3e5205787b772e3b25ee8601b86a/pytest-runner-2.9.tar.gz";
+      md5 = "2212a2e34404b0960b2fdc2c469247b2";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit ];
     };
   };
   pytest-timeout = super.buildPythonPackage {
-    name = "pytest-timeout-0.4";
+    name = "pytest-timeout-1.2.0";
     buildInputs = with self; [];
     doCheck = false;
     propagatedBuildInputs = with self; [pytest];
     src = fetchurl {
-      url = "https://pypi.python.org/packages/24/48/5f6bd4b8026a26e1dd427243d560a29a0f1b24a5c7cffca4bf049a7bb65b/pytest-timeout-0.4.tar.gz";
-      md5 = "03b28aff69cbbfb959ed35ade5fde262";
+      url = "https://pypi.python.org/packages/cc/b7/b2a61365ea6b6d2e8881360ae7ed8dad0327ad2df89f2f0be4a02304deb2/pytest-timeout-1.2.0.tar.gz";
+      md5 = "83607d91aa163562c7ee835da57d061d";
     };
     meta = {
       license = [ pkgs.lib.licenses.mit { fullName = "DFSG approved"; } ];

requirements.txt

@@ -39,7 +39,6 b' WebHelpers==1.3'
 
 WebHelpers2==2.0
 WebOb==1.3.1
-WebTest==1.4.3
 Whoosh==2.7.0
 alembic==0.8.4
 amqplib==1.0.2
@@ -54,8 +53,6 b' channelstream==0.5.2'
 click==5.1
 colander==1.2
 configobj==5.0.6
-cov-core==1.15.0
-coverage==3.7.1
 cssselect==0.9.1
 decorator==3.4.2
 deform==2.0a2
@@ -85,7 +82,6 b' itsdangerous==0.24'
 kombu==1.5.1
 lxml==3.4.4
 meld3==1.0.2
-mock==1.0.1
 msgpack-python==0.4.6
 nose==1.3.6
 objgraph==2.0.0
@@ -93,7 +89,6 b' packaging==15.2'
 paramiko==1.15.1
 psutil==4.3.1
 psycopg2==2.6.1
-py==1.4.29
 py-bcrypt==0.4
 py-gfm==0.1.3
 pycrypto==2.6.1
@@ -106,12 +101,6 b' pyramid-debugtoolbar==2.4.2'
 pyramid-jinja2==2.5
 pyramid-mako==1.0.2
 pysqlite==2.6.3
-pytest==2.8.5
-pytest-runner==2.7.1
-pytest-catchlog==1.2.2
-pytest-cov==1.8.1
-pytest-profiling==1.0.1
-pytest-timeout==0.4
 python-dateutil==1.5
 python-ldap==2.4.19
 python-memcached==1.57
@@ -148,3 +137,18 b' zope.cachedescriptors==4.0.0'
 zope.deprecation==4.1.2
 zope.event==4.0.3
 zope.interface==4.1.3
+
+# test related requirements
+pytest==3.0.5
+py==1.4.31
+pytest-runner==2.9.0
+pytest-catchlog==1.2.2
+pytest-cov==2.4.0
+pytest-profiling==1.2.2
+gprof2dot==2016.10.13
+pytest-timeout==1.2.0
+pytest-sugar==0.7.1
+mock==1.0.1
+WebTest==1.4.3
+cov-core==1.15.0
+coverage==3.7.1

rhodecode/tests/lib/test_hooks_daemon.py

@@ -122,13 +122,13 b' class TestHooksHttpHandler(object):'
         fake_date = '1/Nov/2015 00:00:00'
         date_patcher = mock.patch.object(
             handler, 'log_date_time_string', return_value=fake_date)
-        with date_patcher, caplog.atLevel(logging.DEBUG):
+        with date_patcher, caplog.at_level(logging.DEBUG):
             handler.log_message('Some message %d, %s', 123, 'string')
 
         expected_message = '{} - - [{}] Some message 123, string'.format(
             ip_port[0], fake_date)
         assert_message_in_log(
-            caplog.records(), expected_message,
+            caplog.records, expected_message,
             levelno=logging.DEBUG, module='hooks_daemon')
 
     def _generate_post_request(self, data):
@@ -175,7 +175,7 b' class TestPyro4HooksCallbackDaemon(objec'
     def test_prepare_inits_pyro4_and_registers_hooks(self, caplog):
         pyro4_daemon = mock.Mock()
 
-        with self._pyro4_patcher(pyro4_daemon), caplog.atLevel(logging.DEBUG):
+        with self._pyro4_patcher(pyro4_daemon), caplog.at_level(logging.DEBUG):
             daemon = hooks_daemon.Pyro4HooksCallbackDaemon()
 
         assert daemon._daemon == pyro4_daemon
@@ -186,7 +186,7 b' class TestPyro4HooksCallbackDaemon(objec'
         assert isinstance(args[0], hooks_daemon.Hooks)
 
         assert_message_in_log(
-            caplog.records(),
+            caplog.records,
             'Preparing callback daemon and registering hook object',
             levelno=logging.DEBUG, module='hooks_daemon')
 
@@ -213,7 +213,7 b' class TestPyro4HooksCallbackDaemon(objec'
         with self._pyro4_patcher(pyro4_daemon):
             daemon = hooks_daemon.Pyro4HooksCallbackDaemon()
 
-        with self._thread_patcher(thread), caplog.atLevel(logging.DEBUG):
+        with self._thread_patcher(thread), caplog.at_level(logging.DEBUG):
             with daemon:
                 assert daemon._daemon == pyro4_daemon
                 assert daemon._callback_thread == thread
@@ -224,7 +224,7 b' class TestPyro4HooksCallbackDaemon(objec'
         thread.join.assert_called_once_with()
 
         assert_message_in_log(
-            caplog.records(), 'Waiting for background thread to finish.',
+            caplog.records, 'Waiting for background thread to finish.',
             levelno=logging.DEBUG, module='hooks_daemon')
 
     def _pyro4_patcher(self, daemon):
@@ -238,18 +238,18 b' class TestPyro4HooksCallbackDaemon(objec'
 
 class TestHttpHooksCallbackDaemon(object):
     def test_prepare_inits_daemon_variable(self, tcp_server, caplog):
-        with self._tcp_patcher(tcp_server), caplog.atLevel(logging.DEBUG):
+        with self._tcp_patcher(tcp_server), caplog.at_level(logging.DEBUG):
             daemon = hooks_daemon.HttpHooksCallbackDaemon()
         assert daemon._daemon == tcp_server
 
         assert_message_in_log(
-            caplog.records(),
+            caplog.records,
             'Preparing callback daemon and registering hook object',
             levelno=logging.DEBUG, module='hooks_daemon')
 
     def test_prepare_inits_hooks_uri_and_logs_it(
             self, tcp_server, caplog):
-        with self._tcp_patcher(tcp_server), caplog.atLevel(logging.DEBUG):
+        with self._tcp_patcher(tcp_server), caplog.at_level(logging.DEBUG):
             daemon = hooks_daemon.HttpHooksCallbackDaemon()
 
         _, port = tcp_server.server_address
@@ -257,7 +257,7 b' class TestHttpHooksCallbackDaemon(object'
         assert daemon.hooks_uri == expected_uri
 
         assert_message_in_log(
-            caplog.records(), 'Hooks uri is: {}'.format(expected_uri),
+            caplog.records, 'Hooks uri is: {}'.format(expected_uri),
             levelno=logging.DEBUG, module='hooks_daemon')
 
     def test_run_creates_a_thread(self, tcp_server):
@@ -280,11 +280,11 b' class TestHttpHooksCallbackDaemon(object'
         with self._tcp_patcher(tcp_server):
             daemon = hooks_daemon.HttpHooksCallbackDaemon()
 
-        with self._thread_patcher(mock.Mock()), caplog.atLevel(logging.DEBUG):
+        with self._thread_patcher(mock.Mock()), caplog.at_level(logging.DEBUG):
             daemon._run()
 
         assert_message_in_log(
-            caplog.records(),
+            caplog.records,
             'Running event loop of callback daemon in background thread',
             levelno=logging.DEBUG, module='hooks_daemon')
 
@@ -294,7 +294,7 b' class TestHttpHooksCallbackDaemon(object'
         with self._tcp_patcher(tcp_server):
             daemon = hooks_daemon.HttpHooksCallbackDaemon()
 
-        with self._thread_patcher(thread), caplog.atLevel(logging.DEBUG):
+        with self._thread_patcher(thread), caplog.at_level(logging.DEBUG):
             with daemon:
                 assert daemon._daemon == tcp_server
                 assert daemon._callback_thread == thread
@@ -305,7 +305,7 b' class TestHttpHooksCallbackDaemon(object'
         thread.join.assert_called_once_with()
 
         assert_message_in_log(
-            caplog.records(), 'Waiting for background thread to finish.',
+            caplog.records, 'Waiting for background thread to finish.',
             levelno=logging.DEBUG, module='hooks_daemon')
 
     def _tcp_patcher(self, tcp_server):

rhodecode/tests/vcs/test_client_http.py

@@ -37,7 +37,7 b' def test_uses_persistent_http_connection'
             remote_call(normal=True, closed=False)
 
     new_connections = [
-        r for r in caplog.record_tuples() if is_new_connection(*r)]
+        r for r in caplog.record_tuples if is_new_connection(*r)]
     assert len(new_connections) <= 1