diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-05 02:11:27 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-05 02:11:27 -0700 |
commit | 6efc786c94afa7eb9270b92d3d7022f190a3de48 (patch) | |
tree | d8f44bee59f3c3846633ef199891f6649904d97c /roles/openshift_health_checker/test/etcd_traffic_test.py | |
parent | 64b5f2f08f813910cb608961a7e58e0d27142a9f (diff) | |
parent | 776b0d9478d92c11c5dd285c758ffae668674f8e (diff) | |
download | openshift-6efc786c94afa7eb9270b92d3d7022f190a3de48.tar.gz openshift-6efc786c94afa7eb9270b92d3d7022f190a3de48.tar.bz2 openshift-6efc786c94afa7eb9270b92d3d7022f190a3de48.tar.xz openshift-6efc786c94afa7eb9270b92d3d7022f190a3de48.zip |
Merge pull request #5658 from sosiouxme/20171004-groups-for-checks
Automatic merge from submit-queue.
nfs, lb, and groups for checks
Checks have been using the byo group names for determining whether they need to be active or not. Now that everything is running through common initialization, stop assuming byo names and start referring to the common ones.
As a follow-on [bugfix](https://bugzilla.redhat.com/show_bug.cgi?id=1496760), run docker checks only where docker will be: nodes, and containerized master/etcd. We specifically don't want to run against lb or nfs, but a whitelist approach is used.
Diffstat (limited to 'roles/openshift_health_checker/test/etcd_traffic_test.py')
-rw-r--r-- | roles/openshift_health_checker/test/etcd_traffic_test.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/roles/openshift_health_checker/test/etcd_traffic_test.py b/roles/openshift_health_checker/test/etcd_traffic_test.py index fae3e578d..dd6f4ad81 100644 --- a/roles/openshift_health_checker/test/etcd_traffic_test.py +++ b/roles/openshift_health_checker/test/etcd_traffic_test.py @@ -4,14 +4,14 @@ from openshift_checks.etcd_traffic import EtcdTraffic @pytest.mark.parametrize('group_names,version,is_active', [ - (['masters'], "3.5", False), - (['masters'], "3.6", False), - (['nodes'], "3.4", False), - (['etcd'], "3.4", True), - (['etcd'], "1.5", True), - (['etcd'], "3.1", False), - (['masters', 'nodes'], "3.5", False), - (['masters', 'etcd'], "3.5", True), + (['oo_masters_to_config'], "3.5", False), + (['oo_masters_to_config'], "3.6", False), + (['oo_nodes_to_config'], "3.4", False), + (['oo_etcd_to_config'], "3.4", True), + (['oo_etcd_to_config'], "1.5", True), + (['oo_etcd_to_config'], "3.1", False), + (['oo_masters_to_config', 'oo_nodes_to_config'], "3.5", False), + (['oo_masters_to_config', 'oo_etcd_to_config'], "3.5", True), ([], "3.4", False), ]) def test_is_active(group_names, version, is_active): @@ -23,9 +23,9 @@ def test_is_active(group_names, version, is_active): @pytest.mark.parametrize('group_names,matched,failed,extra_words', [ - (["masters"], True, True, ["Higher than normal", "traffic"]), - (["masters", "etcd"], False, False, []), - (["etcd"], False, False, []), + (["oo_masters_to_config"], True, True, ["Higher than normal", "traffic"]), + (["oo_masters_to_config", "oo_etcd_to_config"], False, False, []), + (["oo_etcd_to_config"], False, False, []), ]) def test_log_matches_high_traffic_msg(group_names, matched, failed, extra_words): def execute_module(module_name, *_): |