Change in vdsm[master]: tests: Add time per test if nose-timer is available

Antoni Segura Puimedon has uploaded a new change for review.

Change subject: tests: Add time per test if nose-timer is available
......................................................................

tests: Add time per test if nose-timer is available

This patch adds an output like:

    resourceManagerTests.ResourceManagerTests.testStressTest: 12.8313s
    resourceManagerTests.ResourceManagerTests.testResourceAcquireTimeout: 1.0069s
    resourceManagerTests.ResourceManagerTests.testResourceLockSwitch: 0.0108s
    resourceManagerTests.ResourceManagerTests.testResourceAutorelease: 0.0101s
    resourceManagerTests.ResourceManagerTests.testResourceInvalidation: 0.0093s
    resourceManagerTests.ResourceManagerTests.testCrashOnSwitch: 0.0067s
    resourceManagerTests.ResourceManagerTests.testResourceSwitchLockTypeFail:
    0.0062s
    resourceManagerTests.ResourceManagerTests.testCancelExclusiveBetweenShared:
    0.0049s
    resourceManagerTests.ResourceManagerTests.testAcquireResourceExclusive: 0.0042s
    resourceManagerTests.ResourceManagerTests.testCancelRequest: 0.0031s
    resourceManagerTests.ResourceManagerTests.testRequestRefCmp: 0.0030s
    resourceManagerTests.ResourceManagerTests.testRequestRecancel: 0.0030s
    resourceManagerTests.ResourceManagerTests.testResourceStatuses: 0.0029s
    resourceManagerTests.ResourceManagerTests.testAccessAttributeNotExposedByRequestRef:
    0.0029s
    resourceManagerTests.ResourceManagerTests.testFailCreateAfterSwitch: 0.0025s
    resourceManagerTests.ResourceManagerTests.testRequestWithBadCallbackOnCancel:
    0.0025s
    resourceManagerTests.ResourceManagerTests.testAcquireResourceShared: 0.0023s
    resourceManagerTests.ResourceManagerTests.testRereleaseResource: 0.0022s
    resourceManagerTests.ResourceManagerTests.testResourceWrapper: 0.0020s
    resourceManagerTests.ResourceManagerTests.testRequestWithBadCallbackOnGrant:
    0.0020s
    resourceManagerTests.ResourceManagerTests.testRequestRefStr: 0.0020s
    resourceManagerTests.ResourceManagerTests.testAccessAttributeNotExposedByWrapper:
    0.0019s
    resourceManagerTests.ResourceManagerTests.testErrorInFactory: 0.0017s
    resourceManagerTests.ResourceManagerTests.testAcquireNonExistingResource:
    0.0016s
    resourceManagerTests.ResourceManagerTests.testRequestInvalidResource: 0.0015s
    resourceManagerTests.ResourceManagerTests.testRequestRegrant: 0.0015s
    resourceManagerTests.ResourceManagerTests.testResourceAcquireInvalidTimeout:
    0.0014s
    resourceManagerTests.ResourceManagerTests.testReleaseInvalidResource: 0.0014s
    resourceManagerTests.ResourceManagerTests.testSingleton: 0.0014s
    resourceManagerTests.ResourceManagerTests.testForceRegisterNamespace: 0.0013s
    resourceManagerTests.ResourceManagerTests.testListNamespaces: 0.0013s
    resourceManagerTests.ResourceManagerTests.testReregisterNamespace: 0.0012s
    resourceManagerTests.ResourceManagerTests.testRegisterInvalidNamespace: 0.0012s

At the end of the usual tests if nose-timer is detected in the
system. It shows the tests over 500ms in yellow and those over 5s
in red.

If you want to get this output, do:
    pip install nose-timer

Change-Id: I4960b30532a84abd259fb268c7e40a1751847a96
Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com&gt;
---
M tests/run_tests_local.sh.in
M tests/testrunner.py
2 files changed, 18 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/71/30171/1

diff --git a/tests/run_tests_local.sh.in b/tests/run_tests_local.sh.in
index d19f22c..f51473d 100644
--- a/tests/run_tests_local.sh.in
+++ b/tests/run_tests_local.sh.in
@@ -7,4 +7,9 @@
     @top_srcdir(a)/tests/makecert.sh
 fi
 
-PYTHONDONTWRITEBYTECODE=1 LC_ALL=C
PYTHONPATH="@top_srcdir@/lib:@top_srcdir@/vdsm:@top_srcdir@/client:@top_srcdir@/vdsm_api:$PYTHONPATH"
"$PYTHON_EXE" @top_srcdir(a)/tests/testrunner.py --local-modules $@
+python -c 'import nosetimer' > /dev/null 2>&1
+if [ $? -eq 0 ]; then
+    EXTRA_ARGS='--with-timer'
+fi
+
+PYTHONDONTWRITEBYTECODE=1 LC_ALL=C
PYTHONPATH="@top_srcdir@/lib:@top_srcdir@/vdsm:@top_srcdir@/client:@top_srcdir@/vdsm_api:$PYTHONPATH"
"$PYTHON_EXE" @top_srcdir(a)/tests/testrunner.py --local-modules $@
"$EXTRA_ARGS"
diff --git a/tests/testrunner.py b/tests/testrunner.py
index eed743f..ec24c2b 100644
--- a/tests/testrunner.py
+++ b/tests/testrunner.py
@@ -40,6 +40,16 @@
 from nose import config
 from nose import core
 from nose import result
+try:
+    from nosetimer.plugin import TimerPlugin
+except ImportError:
+    timer_plugin = None
+else:
+    timer_plugin = TimerPlugin()
+    timer_plugin.enabled = True
+    timer_plugin.timer_ok = 500  # Okay <= 500ms
+    timer_plugin.timer_warning = 5000  # Warn > 5s
+    timer_plugin.timer_no_color = False  # Enable color output
 
 from testValidation import SlowTestsPlugin, StressTestsPlugin
 
@@ -378,6 +388,8 @@
                          plugins=core.DefaultPluginManager())
     conf.plugins.addPlugin(SlowTestsPlugin())
     conf.plugins.addPlugin(StressTestsPlugin())
+    if timer_plugin is not None:
+        conf.plugins.addPlugin(timer_plugin)
 
     runner = VdsmTestRunner(stream=conf.stream,
                             verbosity=conf.verbosity,


-- 
To view, visit http://gerrit.ovirt.org/30171
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4960b30532a84abd259fb268c7e40a1751847a96
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;