diff options
| author |   Emma Foley <emma.l.foley@intel.com> | 2018-03-15 21:46:37 +0000 |
|---|---|---|
| committer | Emma Foley <emma.l.foley@intel.com> | 2018-03-15 21:59:54 +0000 |
| commit | f6e7b3b48f49a607da05663d7963945849e04002 (patch) | |
| tree | ac8d019ed82aed7fc6831017f599ed9abc4ab909 /baro_tests/collectd.py | |
| parent | 307db2dfb4050619601f9e02375d4c64e5525c43 (diff) | |
Update functest to fix failing tests
* MCE log plugin was failing becaue it wasn't enables
* Updated a check for kernel version to match Fraser
compute nodes on Apex
* RDT was failing when virtual compute nodes were used
* Add check to detect whether compute node is a VM
* Skip RDT when running in a VM
* Gnocchi metrics were failing
* increase the wait time between checking metrics
* CSV checks were failing on Hugepages
* functest was assuming that tests were running on
a system with at least two NUMA nodes
* Only check for metrics on node0 of the system
* Report was showing FAIL even if a test was not executed
* Update the report output to show SKIP instead
JIRA: BAROMETER-91
Change-Id: I4f70fc84fce80054a7aca2116357b0233f355f70
Signed-off-by: Emma Foley <emma.l.foley@intel.com>
Diffstat (limited to 'baro_tests/collectd.py')
| -rw-r--r-- | baro_tests/collectd.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/baro_tests/collectd.py b/baro_tests/collectd.py index 2682c2a0..188afab1 100644 --- a/baro_tests/collectd.py +++ b/baro_tests/collectd.py @@ -322,28 +322,28 @@ def _print_final_result_of_plugin( elif (id, out_plugin, plugin, False) in results: print_line += ' FAIL |' else: - print_line += ' NOT EX |' + print_line += ' SKIP |' elif out_plugin == 'AODH': if (id, out_plugin, plugin, True) in results: print_line += ' PASS |' elif (id, out_plugin, plugin, False) in results: print_line += ' FAIL |' else: - print_line += ' FAIL |' + print_line += ' SKIP |' elif out_plugin == 'SNMP': if (id, out_plugin, plugin, True) in results: print_line += ' PASS |' elif (id, out_plugin, plugin, False) in results: print_line += ' FAIL |' else: - print_line += ' FAIL |' + print_line += ' SKIP |' elif out_plugin == 'CSV': if (id, out_plugin, plugin, True) in results: print_line += ' PASS |' elif (id, out_plugin, plugin, False) in results: print_line += ' FAIL |' else: - print_line += ' NOT EX |' + print_line += ' SKIP |' else: print_line += ' SKIP |' return print_line @@ -468,6 +468,9 @@ def _exec_testcase( bridge for bridge in ovs_interfaces if bridge in ovs_configured_bridges] plugin_prerequisites = { + 'intel_rdt': [( + conf.is_rdt_available(compute_node), + 'RDT not avaialble on VMs')], 'mcelog': [( conf.is_mcelog_installed(compute_node, 'mcelog'), 'mcelog must be installed.')], @@ -504,8 +507,7 @@ def _exec_testcase( 'intel_rdt': [ 'intel_rdt-0-2'], 'hugepages': [ - 'hugepages-mm-2048Kb', 'hugepages-node0-2048Kb', - 'hugepages-node1-2048Kb'], + 'hugepages-mm-2048Kb', 'hugepages-node0-2048Kb',], # 'ipmi': ['ipmi'], 'mcelog': [ 'mcelog-SOCKET_0_CHANNEL_0_DIMM_any', @@ -634,7 +636,7 @@ def mcelog_install(): for node in nodes: if node.is_compute(): centos_release = node.run_cmd('uname -r') - if '3.10.0-514.26.2.el7.x86_64' not in centos_release: + if centos_release not in ('3.10.0-514.26.2.el7.x86_64', '3.10.0-693.17.1.el7.x86_64'): logger.info( 'Mcelog will NOT be enabled on node-{}.' + ' Unsupported CentOS release found ({}).'.format( |