fix private class access + useless asyncio

Signed-off-by: LucaNicosia <[email protected]>

Author: LucaNicosia

tests/conftest.py

@@ -11,7 +11,6 @@
 import pandas as pd
 import pytest
 import yaml
-from _pytest.mark.structures import Mark, MarkDecorator
 from filelock import FileLock
 
 from nubia import Nubia
@@ -41,7 +40,7 @@
                 for k, v in SqCommand.get_plugins().items()
                 if k not in ['TopmemCmd', 'TopcpuCmd']]
 
-tables = get_tables()
+tables = [t for t in get_tables() if t not in ['topmem', 'topcpu']]
 
 
 @pytest.fixture(scope='session')
@@ -209,7 +208,7 @@ def load_up_the_tests(folder):
                     # the marks MUST be registered in pytest.ini
                     markers = []
                     if 'marks' in t:
-                        markers = [MarkDecorator(Mark(x, [], {}))
+                        markers = [getattr(pytest.mark, x)
                                    for x in t['marks'].split()]
                     if 'xfail' in t:
                         except_err = None

tests/integration/test_rest.py

@@ -4,15 +4,14 @@
 import warnings
 
 import pytest
-from _pytest.mark.structures import Mark, MarkDecorator
 import pandas as pd
 from fastapi.testclient import TestClient
 
-from tests.conftest import cli_commands, create_dummy_config_file
+from tests.conftest import cli_commands, create_dummy_config_file, tables
 
 from suzieq.restServer.query import (app, get_configured_api_key,
                                      API_KEY_NAME)
-from suzieq.sqobjects import get_tables, get_sqobject
+from suzieq.sqobjects import get_sqobject
 from suzieq.restServer import query
 
 ENDPOINT = "http://localhost:8000/api/v2"
@@ -389,10 +388,10 @@ def get(endpoint, service, verb, args):
 
 @ pytest.mark.rest
 @ pytest.mark.parametrize("service", [
-    pytest.param(cmd, marks=MarkDecorator(Mark(cmd, [], {})))
+    pytest.param(cmd, marks=getattr(pytest.mark, cmd))
     for cmd in cli_commands])
 @pytest.mark.parametrize("verb", [
-    pytest.param(verb, marks=MarkDecorator(Mark(verb, [], {})))
+    pytest.param(verb, marks=getattr(pytest.mark, verb))
     for verb in VERBS])
 @pytest.mark.parametrize("arg", FILTERS)
 # pylint: disable=redefined-outer-name, unused-argument
@@ -403,7 +402,7 @@ def test_rest_services(app_initialize, service, verb, arg):
 
 @ pytest.mark.rest
 @ pytest.mark.parametrize("service, verb", [
-    (cmd, verb) for cmd in get_tables() for verb in VERBS])
+    (cmd, verb) for cmd in tables for verb in VERBS])
 def test_rest_arg_consistency(service, verb):
     '''check that the arguments used in REST match whats in sqobjects'''
 

tests/integration/test_schema_read.py

@@ -1,15 +1,14 @@
 import pytest
-from _pytest.mark.structures import Mark, MarkDecorator
 
-from tests.conftest import DATADIR
-from suzieq.sqobjects import get_tables, get_sqobject
+from tests.conftest import DATADIR, tables
+from suzieq.sqobjects import get_sqobject
 
 
 @ pytest.mark.schema
 @ pytest.mark.parametrize('table',
                           [pytest.param(x,
-                                        marks=MarkDecorator(Mark(x, [], {})))
-                           for x in get_tables()])
+                                        marks=getattr(pytest.mark, x))
+                           for x in tables])
 @ pytest.mark.parametrize('datadir', DATADIR)
 @pytest.mark.parametrize('columns', [['*'], ['default']])
 def test_schema_data_consistency(table, datadir, columns, get_table_data_cols):

tests/integration/test_sqcmds.py

@@ -7,15 +7,14 @@
 from pathlib import Path
 
 import pytest
-from _pytest.mark.structures import Mark, MarkDecorator
 
 from nubia import context
 import pandas as pd
 
 from tests.conftest import (load_up_the_tests, tables, DATADIR,
                             setup_sqcmds, cli_commands,
                             create_dummy_config_file)
-from suzieq.sqobjects import get_sqobject, get_tables
+from suzieq.sqobjects import get_sqobject
 from suzieq.cli.sqcmds import *  # noqa
 from suzieq.version import SUZIEQ_VERSION
 from suzieq.shared.utils import get_sq_install_dir
@@ -28,10 +27,10 @@
 @pytest.mark.sqcmds
 @pytest.mark.slow
 @pytest.mark.parametrize("command",  [
-    pytest.param(cmd, marks=MarkDecorator(Mark(cmd, [], {})))
+    pytest.param(cmd, marks=getattr(pytest.mark, cmd))
     for cmd in cli_commands])
 @pytest.mark.parametrize("verb", [
-    pytest.param(verb, marks=MarkDecorator(Mark(verb, [], {})))
+    pytest.param(verb, marks=getattr(pytest.mark, verb))
     for verb in verbs])
 def test_commands(setup_nubia, get_cmd_object_dict, command, verb):
     """ runs through all of the commands for each of the sqcmds
@@ -67,7 +66,7 @@ def test_summary_exception(setup_nubia):
 
 @pytest.mark.sqcmds
 @pytest.mark.parametrize("cmd", [
-    pytest.param(cmd, marks=MarkDecorator(Mark(cmd, [], {})))
+    pytest.param(cmd, marks=getattr(pytest.mark, cmd))
     for cmd in cli_commands])
 def test_all_columns(setup_nubia, get_cmd_object_dict, cmd):
     s = _test_command(get_cmd_object_dict[cmd], 'show', None,
@@ -78,7 +77,7 @@ def test_all_columns(setup_nubia, get_cmd_object_dict, cmd):
 @pytest.mark.sqcmds
 @pytest.mark.filter
 @pytest.mark.parametrize("cmd", [
-    pytest.param(cmd, marks=MarkDecorator(Mark(cmd, [], {})))
+    pytest.param(cmd, marks=getattr(pytest.mark, cmd))
     for cmd in cli_commands])
 def test_hostname_show_filter(setup_nubia, get_cmd_object_dict, cmd):
     if cmd != "table":
@@ -90,7 +89,7 @@ def test_hostname_show_filter(setup_nubia, get_cmd_object_dict, cmd):
 @pytest.mark.sqcmds
 @pytest.mark.filter
 @pytest.mark.parametrize("cmd", [
-    pytest.param(cmd, marks=MarkDecorator(Mark(cmd, [], {})))
+    pytest.param(cmd, marks=getattr(pytest.mark, cmd))
     for cmd in cli_commands])
 def test_engine_show_filter(setup_nubia, get_cmd_object_dict, cmd):
     s = _test_command(get_cmd_object_dict[cmd], 'show', None,
@@ -101,7 +100,7 @@ def test_engine_show_filter(setup_nubia, get_cmd_object_dict, cmd):
 @pytest.mark.sqcmds
 @pytest.mark.filter
 @pytest.mark.parametrize("cmd", [
-    pytest.param(cmd, marks=MarkDecorator(Mark(cmd, [], {})))
+    pytest.param(cmd, marks=getattr(pytest.mark, cmd))
     for cmd in cli_commands])
 def test_namespace_show_filter(setup_nubia, get_cmd_object_dict, cmd):
     s = _test_command(get_cmd_object_dict[cmd], 'show', None,
@@ -112,7 +111,7 @@ def test_namespace_show_filter(setup_nubia, get_cmd_object_dict, cmd):
 @pytest.mark.sqcmds
 @pytest.mark.filter
 @pytest.mark.parametrize("cmd", [
-    pytest.param(cmd, marks=MarkDecorator(Mark(cmd, [], {})))
+    pytest.param(cmd, marks=getattr(pytest.mark, cmd))
     for cmd in cli_commands])
 def test_view_show_filter(setup_nubia, get_cmd_object_dict, cmd):
     s = _test_command(get_cmd_object_dict[cmd], 'show', None, {'view': 'all'})
@@ -122,7 +121,7 @@ def test_view_show_filter(setup_nubia, get_cmd_object_dict, cmd):
 @pytest.mark.sqcmds
 @pytest.mark.filter
 @pytest.mark.parametrize("cmd", [
-    pytest.param(cmd, marks=MarkDecorator(Mark(cmd, [], {})))
+    pytest.param(cmd, marks=getattr(pytest.mark, cmd))
     for cmd in cli_commands])
 def test_start_time_show_filter(setup_nubia, get_cmd_object_dict, cmd):
     s = _test_command(get_cmd_object_dict[cmd], 'show', None, {
@@ -134,7 +133,7 @@ def test_start_time_show_filter(setup_nubia, get_cmd_object_dict, cmd):
 @pytest.mark.filter
 @pytest.mark.fast
 @pytest.mark.parametrize("cmd", [
-    pytest.param(cmd, marks=MarkDecorator(Mark(cmd, [], {})))
+    pytest.param(cmd, marks=getattr(pytest.mark, cmd))
     for cmd in cli_commands])
 def test_columns_show_filter(setup_nubia, get_cmd_object_dict, cmd):
     if cmd != "table":
@@ -146,7 +145,7 @@ def test_columns_show_filter(setup_nubia, get_cmd_object_dict, cmd):
 @pytest.mark.sqcmds
 @pytest.mark.filter
 @pytest.mark.parametrize("cmd", [
-    pytest.param(cmd, marks=MarkDecorator(Mark(cmd, [], {})))
+    pytest.param(cmd, marks=getattr(pytest.mark, cmd))
     for cmd in cli_commands])
 def test_bad_show_hostname_filter(setup_nubia, get_cmd_object_dict, cmd):
     options = {'hostname': 'unknown'}
@@ -156,7 +155,7 @@ def test_bad_show_hostname_filter(setup_nubia, get_cmd_object_dict, cmd):
 @pytest.mark.sqcmds
 @pytest.mark.filter
 @pytest.mark.parametrize("cmd", [
-    pytest.param(cmd, marks=MarkDecorator(Mark(cmd, [], {})))
+    pytest.param(cmd, marks=getattr(pytest.mark, cmd))
     for cmd in cli_commands])
 def test_bad_show_engine_filter(setup_nubia, get_cmd_object_dict, cmd):
     options = {'engine': 'unknown'}
@@ -166,7 +165,7 @@ def test_bad_show_engine_filter(setup_nubia, get_cmd_object_dict, cmd):
 @pytest.mark.sqcmds
 @pytest.mark.filter
 @pytest.mark.parametrize("cmd", [
-    pytest.param(cmd, marks=MarkDecorator(Mark(cmd, [], {})))
+    pytest.param(cmd, marks=getattr(pytest.mark, cmd))
     for cmd in cli_commands])
 def test_bad_start_time_filter(setup_nubia, get_cmd_object_dict, cmd):
     options = {'start_time': 'unknown'}
@@ -178,7 +177,7 @@ def test_bad_start_time_filter(setup_nubia, get_cmd_object_dict, cmd):
 @pytest.mark.sqcmds
 @pytest.mark.filter
 @pytest.mark.parametrize("cmd", [
-    pytest.param(cmd, marks=MarkDecorator(Mark(cmd, [], {})))
+    pytest.param(cmd, marks=getattr(pytest.mark, cmd))
     for cmd in cli_commands])
 def test_bad_show_namespace_filter(setup_nubia, get_cmd_object_dict, cmd):
     options = {'namespace': 'unknown'}
@@ -214,7 +213,7 @@ def _test_bad_show_filter_w_assert(cmd, options):
 @pytest.mark.sqcmds
 @pytest.mark.filter
 @pytest.mark.parametrize('cmd', [
-    pytest.param(cmd, marks=MarkDecorator(Mark(cmd, [], {})))
+    pytest.param(cmd, marks=getattr(pytest.mark, cmd))
     for cmd in cli_commands])
 def test_context_filtering(setup_nubia, get_cmd_object_dict, cmd):
     for options in good_filters:
@@ -225,7 +224,7 @@ def test_context_filtering(setup_nubia, get_cmd_object_dict, cmd):
 @pytest.mark.sqcmds
 @pytest.mark.filter
 @pytest.mark.parametrize('cmd', [
-    pytest.param(cmd, marks=MarkDecorator(Mark(cmd, [], {})))
+    pytest.param(cmd, marks=getattr(pytest.mark, cmd))
     for cmd in cli_commands])
 def test_context_namespace_filtering(setup_nubia, get_cmd_object_dict, cmd):
     s = _test_context_filtering(get_cmd_object_dict[cmd],
@@ -238,7 +237,7 @@ def test_context_namespace_filtering(setup_nubia, get_cmd_object_dict, cmd):
 @pytest.mark.sqcmds
 @pytest.mark.filter
 @pytest.mark.parametrize('cmd', [
-    pytest.param(cmd, marks=MarkDecorator(Mark(cmd, [], {})))
+    pytest.param(cmd, marks=getattr(pytest.mark, cmd))
     for cmd in cli_commands])
 def test_context_engine_filtering(setup_nubia, get_cmd_object_dict, cmd):
     s = _test_context_filtering(get_cmd_object_dict[cmd], {'engine': 'pandas'})
@@ -248,7 +247,7 @@ def test_context_engine_filtering(setup_nubia, get_cmd_object_dict, cmd):
 @pytest.mark.sqcmds
 @pytest.mark.fast
 @pytest.mark.parametrize('cmd', [
-    pytest.param(cmd, marks=MarkDecorator(Mark(cmd, [], {})))
+    pytest.param(cmd, marks=getattr(pytest.mark, cmd))
     for cmd in cli_commands])
 def test_context_start_time_filtering(setup_nubia, get_cmd_object_dict, cmd):
     # before the latest data, so might be more data than the default
@@ -268,8 +267,8 @@ def test_table_describe(setup_nubia, table):
 @ pytest.mark.parametrize('table',
                           [pytest.param(
                               x,
-                              marks=MarkDecorator(Mark(x, [], {})))
-                           for x in get_tables()
+                              marks=getattr(pytest.mark, x))
+                           for x in tables
                            if x not in ['path', 'topmem', 'topcpu',
                                         'topmem', 'time', 'ifCounters',
                                         'ospfIf', 'ospfNbr',
@@ -307,8 +306,8 @@ def test_sqcmds_regex_hostname(table, datadir):
 @ pytest.mark.parametrize('table',
                           [pytest.param(
                               x,
-                              marks=MarkDecorator(Mark(x, [], {})))
-                           for x in get_tables()
+                              marks=getattr(pytest.mark, x))
+                           for x in tables
                            if x not in ['path', 'inventory']
                            ])
 @ pytest.mark.parametrize('datadir', ['tests/data/parquet/'])

tests/unit/poller/controller/sources/native/test_native.py

@@ -109,7 +109,6 @@ async def test_invalid_hosts(default_config):
 @pytest.mark.poller_unit_tests
 @pytest.mark.controller_unit_tests
 @pytest.mark.controller_source_native
-@pytest.mark.asyncio
 def test_validate_inventory(default_config):
     """Check that validate_inventory raise correctly
     """
@@ -129,7 +128,6 @@ def test_validate_inventory(default_config):
 @pytest.mark.poller_unit_tests
 @pytest.mark.controller_unit_tests
 @pytest.mark.controller_source_native
-@pytest.mark.asyncio
 @pytest.mark.parametrize('address', [
     '192.168.0',
     '192.168.00.1',