From 64788a1997d839fa1f9e8b76451559a300b717dc Mon Sep 17 00:00:00 2001 From: Sebastian Lenzlinger Date: Wed, 8 May 2024 03:06:20 +0200 Subject: [PATCH] Move unused modules into archive. --- {code/iottb/utils => archive}/capture_metadata_utils.py | 0 {code/iottb/utils => archive}/device_metadata_utils.py | 0 code/iottb/subcommands/add_device.py | 6 ++++-- code/tests/subcommands/test_add_device.py | 2 +- code/tests/utils/test_capture_metadata_utils.py | 6 +----- 5 files changed, 6 insertions(+), 8 deletions(-) rename {code/iottb/utils => archive}/capture_metadata_utils.py (100%) rename {code/iottb/utils => archive}/device_metadata_utils.py (100%) diff --git a/code/iottb/utils/capture_metadata_utils.py b/archive/capture_metadata_utils.py similarity index 100% rename from code/iottb/utils/capture_metadata_utils.py rename to archive/capture_metadata_utils.py diff --git a/code/iottb/utils/device_metadata_utils.py b/archive/device_metadata_utils.py similarity index 100% rename from code/iottb/utils/device_metadata_utils.py rename to archive/device_metadata_utils.py diff --git a/code/iottb/subcommands/add_device.py b/code/iottb/subcommands/add_device.py index ea9f7b7..b919215 100644 --- a/code/iottb/subcommands/add_device.py +++ b/code/iottb/subcommands/add_device.py @@ -1,11 +1,13 @@ +import logging import pathlib from iottb import definitions -from iottb.definitions import DEVICE_METADATA_FILE, ReturnCodes +from iottb.definitions import DEVICE_METADATA_FILE from iottb.logger import logger from iottb.models.device_metadata_model import DeviceMetadata -from iottb.utils.device_metadata_utils import * +from archive.device_metadata_utils import * +logger.setLevel(logging.INFO) # Since module currently passes all tests def setup_init_device_root_parser(subparsers): parser = subparsers.add_parser('add-device', aliases=['add-device-root', 'add']) diff --git a/code/tests/subcommands/test_add_device.py b/code/tests/subcommands/test_add_device.py index d2b4044..0d78f82 100644 --- a/code/tests/subcommands/test_add_device.py +++ b/code/tests/subcommands/test_add_device.py @@ -8,7 +8,7 @@ import shutil from iottb.__main__ import main -class TestDeviceSetup(unittest.TestCase): +class TestDeviceMetadataFileCreation(unittest.TestCase): def setUp(self): self.test_dir = Path('/tmp/iottbtest/test_add_device') self.test_dir.mkdir(parents=True, exist_ok=True) diff --git a/code/tests/utils/test_capture_metadata_utils.py b/code/tests/utils/test_capture_metadata_utils.py index 71278c3..139597f 100644 --- a/code/tests/utils/test_capture_metadata_utils.py +++ b/code/tests/utils/test_capture_metadata_utils.py @@ -1,6 +1,2 @@ -import json -from pathlib import Path -from unittest.mock import mock_open, patch -import pytest -from iottb.utils.capture_metadata_utils import set_device_ip_address \ No newline at end of file +