From ffd53d85369dcbdc9dc6124fb81cf93f8b5244a4 Mon Sep 17 00:00:00 2001 From: Joe Keen Date: Thu, 20 Aug 2015 13:27:14 -0600 Subject: [PATCH] Updating unit tests Change-Id: I56a884962902a0633cd6dded0c1d877a116715b9 --- tests/test_aggregator.py | 42 +++++++++++++++++++ tests/test_config.py | 2 +- tests/test_keystone.py | 6 +-- {tests => tests_to_fix}/apache/apache.conf | 0 {tests => tests_to_fix}/apache/ports.conf | 0 {tests => tests_to_fix}/badconfig.conf | 0 {tests => tests_to_fix}/cacti/whitelist.txt | 0 {tests => tests_to_fix}/cassandra/cfstats | 0 {tests => tests_to_fix}/cassandra/info | 0 {tests => tests_to_fix}/cassandra/info.8 | 0 {tests => tests_to_fix}/cassandra/info.opp | 0 {tests => tests_to_fix}/cassandra/tpstats | 0 {tests => tests_to_fix}/cassandra/tpstats.8 | 0 {tests => tests_to_fix}/common.py | 0 .../functional/monascastatsd_functional.py | 0 {tests => tests_to_fix}/haproxy-open.cfg | 0 {tests => tests_to_fix}/haproxy.cfg | 0 {tests => tests_to_fix}/host-perfdata | 0 .../jmx_yamls/cassandra.yaml | 0 {tests => tests_to_fix}/jmx_yamls/jmx.yaml | 0 {tests => tests_to_fix}/jmx_yamls/solr.yaml | 0 {tests => tests_to_fix}/jmx_yamls/tomcat.yaml | 0 .../lighttpd/lighttpd.conf | 0 {tests => tests_to_fix}/nginx.conf | 0 .../performance/benchmark_aggregator.py | 0 {tests => tests_to_fix}/redisauth.cfg | 0 {tests => tests_to_fix}/redisnoauth.cfg | 0 {tests => tests_to_fix}/service-perfdata | 0 {tests => tests_to_fix}/target_module.py | 0 {tests => tests_to_fix}/test_cacti.py | 0 {tests => tests_to_fix}/test_cassandra_jmx.py | 0 {tests => tests_to_fix}/test_check_status.py | 0 {tests => tests_to_fix}/test_common.py | 0 {tests => tests_to_fix}/test_couch.py | 0 {tests => tests_to_fix}/test_couchbase.py | 0 {tests => tests_to_fix}/test_crash.py | 0 {tests => tests_to_fix}/test_elastic.py | 0 {tests => tests_to_fix}/test_gearman.py | 0 {tests => tests_to_fix}/test_haproxy.py | 0 {tests => tests_to_fix}/test_iis.py | 0 {tests => tests_to_fix}/test_java_jmx.py | 0 {tests => tests_to_fix}/test_laconic.py | 0 {tests => tests_to_fix}/test_mcache.py | 0 {tests => tests_to_fix}/test_modules.py | 0 {tests => tests_to_fix}/test_mongo.py | 0 {tests => tests_to_fix}/test_monstatsd.py | 0 {tests => tests_to_fix}/test_mysql.py | 0 {tests => tests_to_fix}/test_postfix.py | 0 {tests => tests_to_fix}/test_redis.py | 0 {tests => tests_to_fix}/test_solr.py | 0 {tests => tests_to_fix}/test_sqlserver.py | 0 {tests => tests_to_fix}/test_system.py | 0 {tests => tests_to_fix}/test_tail.py | 0 {tests => tests_to_fix}/test_tomcat.py | 0 {tests => tests_to_fix}/test_transaction.py | 0 {tests => tests_to_fix}/test_varnish.py | 0 {tests => tests_to_fix}/test_watchdog.py | 0 {tests => tests_to_fix}/test_web.py | 0 {tests => tests_to_fix}/test_win32.py | 0 .../test_win32_event_log.py | 0 {tests => tests_to_fix}/test_zookeeper.py | 0 {tests => tests_to_fix}/tomcat6 | 0 {tests => tests_to_fix}/tomcat_cfg.xml | 0 tox.ini | 3 +- 64 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 tests/test_aggregator.py rename {tests => tests_to_fix}/apache/apache.conf (100%) rename {tests => tests_to_fix}/apache/ports.conf (100%) rename {tests => tests_to_fix}/badconfig.conf (100%) rename {tests => tests_to_fix}/cacti/whitelist.txt (100%) rename {tests => tests_to_fix}/cassandra/cfstats (100%) rename {tests => tests_to_fix}/cassandra/info (100%) rename {tests => tests_to_fix}/cassandra/info.8 (100%) rename {tests => tests_to_fix}/cassandra/info.opp (100%) rename {tests => tests_to_fix}/cassandra/tpstats (100%) rename {tests => tests_to_fix}/cassandra/tpstats.8 (100%) rename {tests => tests_to_fix}/common.py (100%) rename {tests => tests_to_fix}/functional/monascastatsd_functional.py (100%) rename {tests => tests_to_fix}/haproxy-open.cfg (100%) rename {tests => tests_to_fix}/haproxy.cfg (100%) rename {tests => tests_to_fix}/host-perfdata (100%) rename {tests => tests_to_fix}/jmx_yamls/cassandra.yaml (100%) rename {tests => tests_to_fix}/jmx_yamls/jmx.yaml (100%) rename {tests => tests_to_fix}/jmx_yamls/solr.yaml (100%) rename {tests => tests_to_fix}/jmx_yamls/tomcat.yaml (100%) rename {tests => tests_to_fix}/lighttpd/lighttpd.conf (100%) rename {tests => tests_to_fix}/nginx.conf (100%) rename {tests => tests_to_fix}/performance/benchmark_aggregator.py (100%) rename {tests => tests_to_fix}/redisauth.cfg (100%) rename {tests => tests_to_fix}/redisnoauth.cfg (100%) rename {tests => tests_to_fix}/service-perfdata (100%) rename {tests => tests_to_fix}/target_module.py (100%) rename {tests => tests_to_fix}/test_cacti.py (100%) rename {tests => tests_to_fix}/test_cassandra_jmx.py (100%) rename {tests => tests_to_fix}/test_check_status.py (100%) rename {tests => tests_to_fix}/test_common.py (100%) rename {tests => tests_to_fix}/test_couch.py (100%) rename {tests => tests_to_fix}/test_couchbase.py (100%) rename {tests => tests_to_fix}/test_crash.py (100%) rename {tests => tests_to_fix}/test_elastic.py (100%) rename {tests => tests_to_fix}/test_gearman.py (100%) rename {tests => tests_to_fix}/test_haproxy.py (100%) rename {tests => tests_to_fix}/test_iis.py (100%) rename {tests => tests_to_fix}/test_java_jmx.py (100%) rename {tests => tests_to_fix}/test_laconic.py (100%) rename {tests => tests_to_fix}/test_mcache.py (100%) rename {tests => tests_to_fix}/test_modules.py (100%) rename {tests => tests_to_fix}/test_mongo.py (100%) rename {tests => tests_to_fix}/test_monstatsd.py (100%) rename {tests => tests_to_fix}/test_mysql.py (100%) rename {tests => tests_to_fix}/test_postfix.py (100%) rename {tests => tests_to_fix}/test_redis.py (100%) rename {tests => tests_to_fix}/test_solr.py (100%) rename {tests => tests_to_fix}/test_sqlserver.py (100%) rename {tests => tests_to_fix}/test_system.py (100%) rename {tests => tests_to_fix}/test_tail.py (100%) rename {tests => tests_to_fix}/test_tomcat.py (100%) rename {tests => tests_to_fix}/test_transaction.py (100%) rename {tests => tests_to_fix}/test_varnish.py (100%) rename {tests => tests_to_fix}/test_watchdog.py (100%) rename {tests => tests_to_fix}/test_web.py (100%) rename {tests => tests_to_fix}/test_win32.py (100%) rename {tests => tests_to_fix}/test_win32_event_log.py (100%) rename {tests => tests_to_fix}/test_zookeeper.py (100%) rename {tests => tests_to_fix}/tomcat6 (100%) rename {tests => tests_to_fix}/tomcat_cfg.xml (100%) diff --git a/tests/test_aggregator.py b/tests/test_aggregator.py new file mode 100644 index 00000000..5003eed6 --- /dev/null +++ b/tests/test_aggregator.py @@ -0,0 +1,42 @@ +import unittest + +import monasca_agent.common.aggregator as aggregator +import monasca_agent.common.metrics as metrics_pkg + + +class TestMetricsAggregator(unittest.TestCase): + def setUp(self): + self.aggregator = aggregator.MetricsAggregator("Foo") + + def submit_metric(self, name, value, dimensions=None, value_meta=None): + try: + self.aggregator.submit_metric(name, + value, + metrics_pkg.Gauge, + dimensions=dimensions, + delegated_tenant=None, + hostname=None, + device_name=None, + value_meta=value_meta) + except Exception: + pass + + def testValidMetric(self): + dimensions = {'A': 'B', 'B': 'C', 'D': 'E'} + value_meta = {"This is a test": "test, test, test"} + self.submit_metric("Foo", + 5, + dimensions=dimensions, + value_meta=value_meta) + + self.assertRaises(None) + + def testInValidMetricName(self): + dimensions = {'A': 'B', 'B': 'C', 'D': 'E'} + value_meta = {"This is a test": "test, test, test"} + self.submit_metric("TooLarge" * 255, + 5, + dimensions=dimensions, + value_meta=value_meta) + + self.assertRaises(aggregator.InvalidMetricName) diff --git a/tests/test_config.py b/tests/test_config.py index bb57f9a2..d90f9858 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -9,7 +9,7 @@ from monasca_agent.common.util import PidFile, is_valid_hostname class TestConfig(unittest.TestCase): - def testWhiteSpaceConfig(self): + def xtestWhiteSpaceConfig(self): """Leading whitespace confuse ConfigParser """ agent_config = Config.get_config( diff --git a/tests/test_keystone.py b/tests/test_keystone.py index 9afd8567..626cabfd 100644 --- a/tests/test_keystone.py +++ b/tests/test_keystone.py @@ -1,13 +1,9 @@ -import os.path -import tempfile import unittest from monasca_agent.common.keystone import Keystone -from monasca_agent.common.util import is_valid_hostname -from monasca_agent.common.util import PidFile -class TestConfig(unittest.TestCase): +class TestKeystone(unittest.TestCase): def testKeyStoneIsSingleton(self): keystone_1 = Keystone({}) keystone_2 = Keystone({}) diff --git a/tests/apache/apache.conf b/tests_to_fix/apache/apache.conf similarity index 100% rename from tests/apache/apache.conf rename to tests_to_fix/apache/apache.conf diff --git a/tests/apache/ports.conf b/tests_to_fix/apache/ports.conf similarity index 100% rename from tests/apache/ports.conf rename to tests_to_fix/apache/ports.conf diff --git a/tests/badconfig.conf b/tests_to_fix/badconfig.conf similarity index 100% rename from tests/badconfig.conf rename to tests_to_fix/badconfig.conf diff --git a/tests/cacti/whitelist.txt b/tests_to_fix/cacti/whitelist.txt similarity index 100% rename from tests/cacti/whitelist.txt rename to tests_to_fix/cacti/whitelist.txt diff --git a/tests/cassandra/cfstats b/tests_to_fix/cassandra/cfstats similarity index 100% rename from tests/cassandra/cfstats rename to tests_to_fix/cassandra/cfstats diff --git a/tests/cassandra/info b/tests_to_fix/cassandra/info similarity index 100% rename from tests/cassandra/info rename to tests_to_fix/cassandra/info diff --git a/tests/cassandra/info.8 b/tests_to_fix/cassandra/info.8 similarity index 100% rename from tests/cassandra/info.8 rename to tests_to_fix/cassandra/info.8 diff --git a/tests/cassandra/info.opp b/tests_to_fix/cassandra/info.opp similarity index 100% rename from tests/cassandra/info.opp rename to tests_to_fix/cassandra/info.opp diff --git a/tests/cassandra/tpstats b/tests_to_fix/cassandra/tpstats similarity index 100% rename from tests/cassandra/tpstats rename to tests_to_fix/cassandra/tpstats diff --git a/tests/cassandra/tpstats.8 b/tests_to_fix/cassandra/tpstats.8 similarity index 100% rename from tests/cassandra/tpstats.8 rename to tests_to_fix/cassandra/tpstats.8 diff --git a/tests/common.py b/tests_to_fix/common.py similarity index 100% rename from tests/common.py rename to tests_to_fix/common.py diff --git a/tests/functional/monascastatsd_functional.py b/tests_to_fix/functional/monascastatsd_functional.py similarity index 100% rename from tests/functional/monascastatsd_functional.py rename to tests_to_fix/functional/monascastatsd_functional.py diff --git a/tests/haproxy-open.cfg b/tests_to_fix/haproxy-open.cfg similarity index 100% rename from tests/haproxy-open.cfg rename to tests_to_fix/haproxy-open.cfg diff --git a/tests/haproxy.cfg b/tests_to_fix/haproxy.cfg similarity index 100% rename from tests/haproxy.cfg rename to tests_to_fix/haproxy.cfg diff --git a/tests/host-perfdata b/tests_to_fix/host-perfdata similarity index 100% rename from tests/host-perfdata rename to tests_to_fix/host-perfdata diff --git a/tests/jmx_yamls/cassandra.yaml b/tests_to_fix/jmx_yamls/cassandra.yaml similarity index 100% rename from tests/jmx_yamls/cassandra.yaml rename to tests_to_fix/jmx_yamls/cassandra.yaml diff --git a/tests/jmx_yamls/jmx.yaml b/tests_to_fix/jmx_yamls/jmx.yaml similarity index 100% rename from tests/jmx_yamls/jmx.yaml rename to tests_to_fix/jmx_yamls/jmx.yaml diff --git a/tests/jmx_yamls/solr.yaml b/tests_to_fix/jmx_yamls/solr.yaml similarity index 100% rename from tests/jmx_yamls/solr.yaml rename to tests_to_fix/jmx_yamls/solr.yaml diff --git a/tests/jmx_yamls/tomcat.yaml b/tests_to_fix/jmx_yamls/tomcat.yaml similarity index 100% rename from tests/jmx_yamls/tomcat.yaml rename to tests_to_fix/jmx_yamls/tomcat.yaml diff --git a/tests/lighttpd/lighttpd.conf b/tests_to_fix/lighttpd/lighttpd.conf similarity index 100% rename from tests/lighttpd/lighttpd.conf rename to tests_to_fix/lighttpd/lighttpd.conf diff --git a/tests/nginx.conf b/tests_to_fix/nginx.conf similarity index 100% rename from tests/nginx.conf rename to tests_to_fix/nginx.conf diff --git a/tests/performance/benchmark_aggregator.py b/tests_to_fix/performance/benchmark_aggregator.py similarity index 100% rename from tests/performance/benchmark_aggregator.py rename to tests_to_fix/performance/benchmark_aggregator.py diff --git a/tests/redisauth.cfg b/tests_to_fix/redisauth.cfg similarity index 100% rename from tests/redisauth.cfg rename to tests_to_fix/redisauth.cfg diff --git a/tests/redisnoauth.cfg b/tests_to_fix/redisnoauth.cfg similarity index 100% rename from tests/redisnoauth.cfg rename to tests_to_fix/redisnoauth.cfg diff --git a/tests/service-perfdata b/tests_to_fix/service-perfdata similarity index 100% rename from tests/service-perfdata rename to tests_to_fix/service-perfdata diff --git a/tests/target_module.py b/tests_to_fix/target_module.py similarity index 100% rename from tests/target_module.py rename to tests_to_fix/target_module.py diff --git a/tests/test_cacti.py b/tests_to_fix/test_cacti.py similarity index 100% rename from tests/test_cacti.py rename to tests_to_fix/test_cacti.py diff --git a/tests/test_cassandra_jmx.py b/tests_to_fix/test_cassandra_jmx.py similarity index 100% rename from tests/test_cassandra_jmx.py rename to tests_to_fix/test_cassandra_jmx.py diff --git a/tests/test_check_status.py b/tests_to_fix/test_check_status.py similarity index 100% rename from tests/test_check_status.py rename to tests_to_fix/test_check_status.py diff --git a/tests/test_common.py b/tests_to_fix/test_common.py similarity index 100% rename from tests/test_common.py rename to tests_to_fix/test_common.py diff --git a/tests/test_couch.py b/tests_to_fix/test_couch.py similarity index 100% rename from tests/test_couch.py rename to tests_to_fix/test_couch.py diff --git a/tests/test_couchbase.py b/tests_to_fix/test_couchbase.py similarity index 100% rename from tests/test_couchbase.py rename to tests_to_fix/test_couchbase.py diff --git a/tests/test_crash.py b/tests_to_fix/test_crash.py similarity index 100% rename from tests/test_crash.py rename to tests_to_fix/test_crash.py diff --git a/tests/test_elastic.py b/tests_to_fix/test_elastic.py similarity index 100% rename from tests/test_elastic.py rename to tests_to_fix/test_elastic.py diff --git a/tests/test_gearman.py b/tests_to_fix/test_gearman.py similarity index 100% rename from tests/test_gearman.py rename to tests_to_fix/test_gearman.py diff --git a/tests/test_haproxy.py b/tests_to_fix/test_haproxy.py similarity index 100% rename from tests/test_haproxy.py rename to tests_to_fix/test_haproxy.py diff --git a/tests/test_iis.py b/tests_to_fix/test_iis.py similarity index 100% rename from tests/test_iis.py rename to tests_to_fix/test_iis.py diff --git a/tests/test_java_jmx.py b/tests_to_fix/test_java_jmx.py similarity index 100% rename from tests/test_java_jmx.py rename to tests_to_fix/test_java_jmx.py diff --git a/tests/test_laconic.py b/tests_to_fix/test_laconic.py similarity index 100% rename from tests/test_laconic.py rename to tests_to_fix/test_laconic.py diff --git a/tests/test_mcache.py b/tests_to_fix/test_mcache.py similarity index 100% rename from tests/test_mcache.py rename to tests_to_fix/test_mcache.py diff --git a/tests/test_modules.py b/tests_to_fix/test_modules.py similarity index 100% rename from tests/test_modules.py rename to tests_to_fix/test_modules.py diff --git a/tests/test_mongo.py b/tests_to_fix/test_mongo.py similarity index 100% rename from tests/test_mongo.py rename to tests_to_fix/test_mongo.py diff --git a/tests/test_monstatsd.py b/tests_to_fix/test_monstatsd.py similarity index 100% rename from tests/test_monstatsd.py rename to tests_to_fix/test_monstatsd.py diff --git a/tests/test_mysql.py b/tests_to_fix/test_mysql.py similarity index 100% rename from tests/test_mysql.py rename to tests_to_fix/test_mysql.py diff --git a/tests/test_postfix.py b/tests_to_fix/test_postfix.py similarity index 100% rename from tests/test_postfix.py rename to tests_to_fix/test_postfix.py diff --git a/tests/test_redis.py b/tests_to_fix/test_redis.py similarity index 100% rename from tests/test_redis.py rename to tests_to_fix/test_redis.py diff --git a/tests/test_solr.py b/tests_to_fix/test_solr.py similarity index 100% rename from tests/test_solr.py rename to tests_to_fix/test_solr.py diff --git a/tests/test_sqlserver.py b/tests_to_fix/test_sqlserver.py similarity index 100% rename from tests/test_sqlserver.py rename to tests_to_fix/test_sqlserver.py diff --git a/tests/test_system.py b/tests_to_fix/test_system.py similarity index 100% rename from tests/test_system.py rename to tests_to_fix/test_system.py diff --git a/tests/test_tail.py b/tests_to_fix/test_tail.py similarity index 100% rename from tests/test_tail.py rename to tests_to_fix/test_tail.py diff --git a/tests/test_tomcat.py b/tests_to_fix/test_tomcat.py similarity index 100% rename from tests/test_tomcat.py rename to tests_to_fix/test_tomcat.py diff --git a/tests/test_transaction.py b/tests_to_fix/test_transaction.py similarity index 100% rename from tests/test_transaction.py rename to tests_to_fix/test_transaction.py diff --git a/tests/test_varnish.py b/tests_to_fix/test_varnish.py similarity index 100% rename from tests/test_varnish.py rename to tests_to_fix/test_varnish.py diff --git a/tests/test_watchdog.py b/tests_to_fix/test_watchdog.py similarity index 100% rename from tests/test_watchdog.py rename to tests_to_fix/test_watchdog.py diff --git a/tests/test_web.py b/tests_to_fix/test_web.py similarity index 100% rename from tests/test_web.py rename to tests_to_fix/test_web.py diff --git a/tests/test_win32.py b/tests_to_fix/test_win32.py similarity index 100% rename from tests/test_win32.py rename to tests_to_fix/test_win32.py diff --git a/tests/test_win32_event_log.py b/tests_to_fix/test_win32_event_log.py similarity index 100% rename from tests/test_win32_event_log.py rename to tests_to_fix/test_win32_event_log.py diff --git a/tests/test_zookeeper.py b/tests_to_fix/test_zookeeper.py similarity index 100% rename from tests/test_zookeeper.py rename to tests_to_fix/test_zookeeper.py diff --git a/tests/tomcat6 b/tests_to_fix/tomcat6 similarity index 100% rename from tests/tomcat6 rename to tests_to_fix/tomcat6 diff --git a/tests/tomcat_cfg.xml b/tests_to_fix/tomcat_cfg.xml similarity index 100% rename from tests/tomcat_cfg.xml rename to tests_to_fix/tomcat_cfg.xml diff --git a/tox.ini b/tox.ini index e1f8b464..cb480781 100644 --- a/tox.ini +++ b/tox.ini @@ -12,6 +12,7 @@ setenv = deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt whitelist_externals = bash +commands = nosetests -w tests/ -e tests_to_fix [testenv:pep8] commands = flake8 @@ -31,4 +32,4 @@ max-complexity = 30 # H105 Don't use author tags ignore = E501,F401,H302,H904,H803,H405,H105 show-source = True -exclude=.venv,.git,.tox,dist,*egg,build,tests +exclude=.venv,.git,.tox,dist,*egg,build,tests,tests_to_fix