Small improvements in stress testing.

helpers/__init__.py

@@ -1,4 +1,4 @@
 __all__ = ['tf_cfg', 'deproxy', 'nginx', 'tempesta', 'error', 'flacky',
-           'analyzer', 'stateful', 'dmesg', 'wrk', 'prepare']
+           'analyzer', 'stateful', 'dmesg', 'wrk', 'prepare', 'util']
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

helpers/control.py

@@ -7,6 +7,7 @@
 import asyncore
 import multiprocessing.dummy as multiprocessing
 from . import tf_cfg, remote, error, nginx, tempesta, deproxy, stateful, dmesg
+from . import util
 
 __author__ = 'Tempesta Technologies, Inc.'
 __copyright__ = 'Copyright (C) 2017 Tempesta Technologies, Inc.'
@@ -114,6 +115,7 @@ def set_user_agent(self, ua):
         self.options.append('-H \'User-Agent: %s\'' % ua)
 
 
+@util.deprecated("framework.Wrk")
 class Wrk(Client):
     """ wrk - HTTP benchmark utility.
 

helpers/util.py

@@ -0,0 +1,33 @@
+"""
+Utils for the testing framework.
+"""
+from . import tf_cfg
+
+__author__ = 'Tempesta Technologies, Inc.'
+__copyright__ = 'Copyright (C) 2019 Tempesta Technologies, Inc.'
+__license__ = 'GPL2'
+
+
+def deprecated(alt_impl_name):
+    """
+    Decorator to declare a class and its descendants as deprecated.
+    Example ('Foo' is a new alternative implementation which should be used
+    instead):
+
+        @deprecated("Foo")
+        class A(...):
+            ...
+    """
+    def decorator(cls):
+
+        def deprecated_new(new_func):
+            def wrap(cls_arg, *args, **kwargs):
+                tf_cfg.dbg(5, "%s must be used instead of deprecated %s"
+                        % (alt_impl_name, cls_arg.__name__))
+                return new_func(cls_arg, *args, **kwargs)
+            return wrap
+
+        setattr(cls, '__new__', staticmethod(deprecated_new(cls.__new__)))
+        return cls
+
+    return decorator

testers/functional.py

@@ -3,12 +3,14 @@
 import copy
 import asyncore
 from helpers import dmesg, tf_cfg, control, tempesta, deproxy, stateful, remote
+from helpers import util
 from helpers.deproxy import ParseError
 
 __author__ = 'Tempesta Technologies, Inc.'
 __copyright__ = 'Copyright (C) 2017 Tempesta Technologies, Inc.'
 __license__ = 'GPL2'
 
+@util.deprecated("tester.TempestaTest")
 class FunctionalTest(unittest.TestCase):
 
     tfw_clnt_msg_otherr = False

testers/stress.py

@@ -1,11 +1,13 @@
 from __future__ import print_function
 import unittest
 from helpers import tf_cfg, control, tempesta, stateful, dmesg, remote
+from helpers import util
 
 __author__ = 'Tempesta Technologies, Inc.'
 __copyright__ = 'Copyright (C) 2017-2018 Tempesta Technologies, Inc.'
 __license__ = 'GPL2'
 
+@util.deprecated("tester.TempestaTest")
 class StressTest(unittest.TestCase):
     """ Test Suite to use HTTP benchmarks as a clients. Can be used for
     functional testing of schedulers and stress testing for other components.
@@ -162,6 +164,7 @@ def assert_client(self, req, err, statuses):
         tf_cfg.dbg(2, "errors read: %i" % e_read)
         tf_cfg.dbg(2, "errors write: %i" % e_write)
         tf_cfg.dbg(2, "errors timeout: %i" % e_timeout)
+        self.assertGreater(req, 0, msg="No work was done by the client")
         self.assertEqual(err, e_500 + e_502 + e_504 + e_connect, msg=msg)
 
     def assert_clients(self):
@@ -189,7 +192,9 @@ def assert_clients(self):
         exp_max = cl_req_cnt + cl_conn_cnt
         self.assertTrue(
             self.tempesta.stats.cl_msg_received >= exp_min and
-            self.tempesta.stats.cl_msg_received <= exp_max
+            self.tempesta.stats.cl_msg_received <= exp_max,
+            msg="Tempesta received bad number %d of messages, expected [%d:%d]"
+                % (self.tempesta.stats.cl_msg_received, exp_min, exp_max)
         )
 
     def assert_tempesta(self):