Fix tests

Author: badrogger

node_cli/core/node.py

@@ -46,7 +46,6 @@
 from node_cli.configs.cli_logger import LOG_DATA_PATH as CLI_LOG_DATA_PATH
 
 from node_cli.core.nftables import configure_nftables
-# from node_cli.core.iptables import configure_iptables
 from node_cli.core.host import (
     is_node_inited, save_env_params, get_flask_secret_key
 )

scripts/run_nftables_test.sh

@@ -14,5 +14,5 @@ docker run \
     -e GLOBAL_SKALE_DIR="$PROJECT_DIR/tests/etc/skale" \
     -e DOTENV_FILEPATH='tests/test-env' \
     --cap-add=NET_ADMIN --cap-add=NET_RAW \
-    --name ncli-tester ncli-tester py.test -v tests/core/migration_test.py tests/core/nftables_test.py $@
+    --name ncli-tester ncli-tester py.test tests/core/migration_test.py tests/core/nftables_test.py $@
 

scripts/run_tests.sh

@@ -8,4 +8,4 @@ LVMPY_LOG_DIR="$PROJECT_DIR/tests/" \
     TEST_HOME_DIR="$PROJECT_DIR/tests/" \
     GLOBAL_SKALE_DIR="$PROJECT_DIR/tests/etc/skale" \
     DOTENV_FILEPATH='tests/test-env' \
-    py.test -v --cov=$PROJECT_DIR/ --ignore=tests/core/nftables_test.py --ignore=tests/core/migration_test.py tests $@
+    py.test --cov=$PROJECT_DIR/ --ignore=tests/core/nftables_test.py --ignore=tests/core/migration_test.py tests $@

tests/cli/node_test.py

@@ -40,6 +40,7 @@
 )
 from node_cli.utils.exit_codes import CLIExitCodes
 from node_cli.utils.helper import init_default_logger
+from node_cli.utils.meta import CliMeta
 
 from tests.helper import (
     response_mock,
@@ -84,7 +85,9 @@ def test_register_node_with_error(resource_alloc, mocked_g_config):
         )
     assert result.exit_code == 3
     assert (
-        result.output == f'Command failed with following errors:\n--------------------------------------------------\nStrange error\n--------------------------------------------------\nYou can find more info in {G_CONF_HOME}.skale/.skale-cli-log/debug-node-cli.log\n')  # noqa
+        result.output
+        == f'Command failed with following errors:\n--------------------------------------------------\nStrange error\n--------------------------------------------------\nYou can find more info in {G_CONF_HOME}.skale/.skale-cli-log/debug-node-cli.log\n'
+    )  # noqa
 
 
 def test_register_node_with_prompted_ip(resource_alloc, mocked_g_config):
@@ -98,7 +101,10 @@ def test_register_node_with_prompted_ip(resource_alloc, mocked_g_config):
             input='0.0.0.0\n',
         )
     assert result.exit_code == 0
-    assert result.output == 'Enter node public IP: 0.0.0.0\nNode registered in SKALE manager.\nFor more info run < skale node info >\n'  # noqa
+    assert (
+        result.output
+        == 'Enter node public IP: 0.0.0.0\nNode registered in SKALE manager.\nFor more info run < skale node info >\n'
+    )  # noqa
 
 
 def test_register_node_with_default_port(resource_alloc, mocked_g_config):
@@ -112,7 +118,10 @@ def test_register_node_with_default_port(resource_alloc, mocked_g_config):
             input='0.0.0.0\n',
         )
     assert result.exit_code == 0
-    assert result.output == 'Enter node public IP: 0.0.0.0\nNode registered in SKALE manager.\nFor more info run < skale node info >\n'  # noqa
+    assert (
+        result.output
+        == 'Enter node public IP: 0.0.0.0\nNode registered in SKALE manager.\nFor more info run < skale node info >\n'
+    )  # noqa
 
 
 def test_register_with_no_alloc(mocked_g_config):
@@ -125,7 +134,10 @@ def test_register_with_no_alloc(mocked_g_config):
         input='0.0.0.0\n',
     )
     assert result.exit_code == 8
-    assert result.output == f"Enter node public IP: 0.0.0.0\nCommand failed with following errors:\n--------------------------------------------------\nNode hasn't been inited before.\nYou should run < skale node init >\n--------------------------------------------------\nYou can find more info in {G_CONF_HOME}.skale/.skale-cli-log/debug-node-cli.log\n"  # noqa
+    assert (
+        result.output
+        == f"Enter node public IP: 0.0.0.0\nCommand failed with following errors:\n--------------------------------------------------\nNode hasn't been inited before.\nYou should run < skale node init >\n--------------------------------------------------\nYou can find more info in {G_CONF_HOME}.skale/.skale-cli-log/debug-node-cli.log\n"
+    )  # noqa
 
 
 def test_node_info_node_info():
@@ -150,7 +162,10 @@ def test_node_info_node_info():
     resp_mock = response_mock(requests.codes.ok, json_data={'payload': payload, 'status': 'ok'})
     result = run_command_mock('node_cli.utils.helper.requests.get', resp_mock, node_info)
     assert result.exit_code == 0
-    assert result.output == '--------------------------------------------------\nNode info\nName: test\nID: 32\nIP: 0.0.0.0\nPublic IP: 1.1.1.1\nPort: 10001\nDomain name: skale.test\nStatus: Active\n--------------------------------------------------\n'  # noqa
+    assert (
+        result.output
+        == '--------------------------------------------------\nNode info\nName: test\nID: 32\nIP: 0.0.0.0\nPublic IP: 1.1.1.1\nPort: 10001\nDomain name: skale.test\nStatus: Active\n--------------------------------------------------\n'
+    )  # noqa
 
 
 def test_node_info_node_info_not_created():
@@ -200,7 +215,10 @@ def test_node_info_node_info_frozen():
     resp_mock = response_mock(requests.codes.ok, json_data={'payload': payload, 'status': 'ok'})
     result = run_command_mock('node_cli.utils.helper.requests.get', resp_mock, node_info)
     assert result.exit_code == 0
-    assert result.output == '--------------------------------------------------\nNode info\nName: test\nID: 32\nIP: 0.0.0.0\nPublic IP: 1.1.1.1\nPort: 10001\nDomain name: skale.test\nStatus: Frozen\n--------------------------------------------------\n'  # noqa
+    assert (
+        result.output
+        == '--------------------------------------------------\nNode info\nName: test\nID: 32\nIP: 0.0.0.0\nPublic IP: 1.1.1.1\nPort: 10001\nDomain name: skale.test\nStatus: Frozen\n--------------------------------------------------\n'
+    )  # noqa
 
 
 def test_node_info_node_info_left():
@@ -225,7 +243,10 @@ def test_node_info_node_info_left():
     resp_mock = response_mock(requests.codes.ok, json_data={'payload': payload, 'status': 'ok'})
     result = run_command_mock('node_cli.utils.helper.requests.get', resp_mock, node_info)
     assert result.exit_code == 0
-    assert result.output == '--------------------------------------------------\nNode info\nName: test\nID: 32\nIP: 0.0.0.0\nPublic IP: 1.1.1.1\nPort: 10001\nDomain name: skale.test\nStatus: Left\n--------------------------------------------------\n'  # noqa
+    assert (
+        result.output
+        == '--------------------------------------------------\nNode info\nName: test\nID: 32\nIP: 0.0.0.0\nPublic IP: 1.1.1.1\nPort: 10001\nDomain name: skale.test\nStatus: Left\n--------------------------------------------------\n'
+    )  # noqa
 
 
 def test_node_info_node_info_leaving():
@@ -250,7 +271,10 @@ def test_node_info_node_info_leaving():
     resp_mock = response_mock(requests.codes.ok, json_data={'payload': payload, 'status': 'ok'})
     result = run_command_mock('node_cli.utils.helper.requests.get', resp_mock, node_info)
     assert result.exit_code == 0
-    assert result.output == '--------------------------------------------------\nNode info\nName: test\nID: 32\nIP: 0.0.0.0\nPublic IP: 1.1.1.1\nPort: 10001\nDomain name: skale.test\nStatus: Leaving\n--------------------------------------------------\n'  # noqa
+    assert (
+        result.output
+        == '--------------------------------------------------\nNode info\nName: test\nID: 32\nIP: 0.0.0.0\nPublic IP: 1.1.1.1\nPort: 10001\nDomain name: skale.test\nStatus: Leaving\n--------------------------------------------------\n'
+    )  # noqa
 
 
 def test_node_info_node_info_in_maintenance():
@@ -275,7 +299,10 @@ def test_node_info_node_info_in_maintenance():
     resp_mock = response_mock(requests.codes.ok, json_data={'payload': payload, 'status': 'ok'})
     result = run_command_mock('node_cli.utils.helper.requests.get', resp_mock, node_info)
     assert result.exit_code == 0
-    assert result.output == '--------------------------------------------------\nNode info\nName: test\nID: 32\nIP: 0.0.0.0\nPublic IP: 1.1.1.1\nPort: 10001\nDomain name: skale.test\nStatus: In Maintenance\n--------------------------------------------------\n'  # noqa
+    assert (
+        result.output
+        == '--------------------------------------------------\nNode info\nName: test\nID: 32\nIP: 0.0.0.0\nPublic IP: 1.1.1.1\nPort: 10001\nDomain name: skale.test\nStatus: In Maintenance\n--------------------------------------------------\n'
+    )  # noqa
 
 
 def test_node_signature():
@@ -306,7 +333,10 @@ def test_restore(mocked_g_config):
         'subprocess.run', new=subprocess_run_mock
     ), patch('node_cli.core.resources.get_disk_size', return_value=BIG_DISK_SIZE), patch(
         'node_cli.utils.decorators.is_node_inited', return_value=False
-    ):
+    ), patch(
+        'node_cli.core.node.get_meta_info',
+        return_value=CliMeta(version='2.4.0', config_stream='3.0.2'),
+    ), patch('node_cli.core.node.configure_firewall_rules'):
         result = run_command(restore_node, [backup_path, './tests/test-env'])
         assert result.exit_code == 0
         assert 'Node is restored from backup\n' in result.output  # noqa
@@ -325,7 +355,10 @@ def test_restore_no_snapshot(mocked_g_config):
         'subprocess.run', new=subprocess_run_mock
     ), patch('node_cli.core.resources.get_disk_size', return_value=BIG_DISK_SIZE), patch(
         'node_cli.utils.decorators.is_node_inited', return_value=False
-    ):
+    ), patch(
+        'node_cli.core.node.get_meta_info',
+        return_value=CliMeta(version='2.4.0', config_stream='3.0.2'),
+    ), patch('node_cli.core.node.configure_firewall_rules'):
         result = run_command(restore_node, [backup_path, './tests/test-env', '--no-snapshot'])
         assert result.exit_code == 0
         assert 'Node is restored from backup\n' in result.output  # noqa
@@ -392,7 +425,7 @@ def test_turn_on_maintenance_off(mocked_g_config):
         'node_cli.core.node.get_flask_secret_key'
     ), mock.patch('node_cli.core.node.turn_on_op'), mock.patch(
         'node_cli.core.node.is_base_containers_alive'
-    ), mock.patch('node_cli.core.node.is_node_inited', return_value=True):
+    ), mock.patch('node_cli.utils.decorators.is_node_inited', return_value=True):
         result = run_command_mock(
             'node_cli.utils.helper.requests.post',
             resp_mock,
@@ -424,14 +457,17 @@ def test_set_domain_name():
 
 
 def test_node_version(meta_file_v2):
-    result = run_command(version)
-    assert result.exit_code == 0
-    assert result.output == '--------------------------------------------------\nVersion: 0.1.1\nConfig Stream: develop\nLvmpy stream: 1.1.2\n--------------------------------------------------\n'  # noqa
+    with mock.patch('node_cli.utils.decorators.is_node_inited', return_value=True):
+        result = run_command(version)
+        assert result.exit_code == 0
+        assert (
+            result.output
+            == '--------------------------------------------------\nVersion: 0.1.1\nConfig Stream: develop\nLvmpy stream: 1.1.2\n--------------------------------------------------\n'
+        )  # noqa
 
-    result = run_command(version, ['--json'])
-    print(repr(result.output))
-    assert result.exit_code == 0
-    assert (
-        result.output
-        == "{'version': '0.1.1', 'config_stream': 'develop', 'docker_lvmpy_stream': '1.1.2'}\n"
-    )  # noqa
+        result = run_command(version, ['--json'])
+        assert result.exit_code == 0
+        assert (
+            result.output
+            == "{'version': '0.1.1', 'config_stream': 'develop', 'docker_lvmpy_stream': '1.1.2'}\n"
+        )  # noqa

tests/core/core_node_test.py

@@ -9,12 +9,11 @@
 import pytest
 import requests
 
-from node_cli.cli import __version__
-
 from node_cli.configs import NODE_DATA_PATH
 from node_cli.configs.resource_allocation import RESOURCE_ALLOCATION_FILEPATH
 from node_cli.core.node import BASE_CONTAINERS_AMOUNT, is_base_containers_alive
 from node_cli.core.node import init, pack_dir, update, is_update_safe, repair_sync
+from node_cli.utils.meta import CliMeta
 
 from tests.helper import response_mock, safe_update_api_response, subprocess_run_mock
 from tests.resources_test import BIG_DISK_SIZE
@@ -170,7 +169,12 @@ def test_update_node(mocked_g_config, resource_file):
         'node_cli.utils.helper.post_request', resp_mock
     ), mock.patch('node_cli.core.resources.get_disk_size', return_value=BIG_DISK_SIZE), mock.patch(
         'node_cli.core.host.init_data_dir'
-    ), mock.patch('node_cli.core.node.get_meta_info', return_value={'version': __version__}):
+    ), mock.patch(
+        'node_cli.core.node.get_meta_info',
+        return_value=CliMeta(
+            version='2.5.0', config_stream='3.0.2'
+            )
+    ):
         with mock.patch( 'node_cli.utils.helper.requests.get', return_value=safe_update_api_response()):  # noqa
             result = update(env_filepath, pull_config_for_schain=None)
             assert result is None