From 592368c590c07760bca71a884f889fde155f6d7e Mon Sep 17 00:00:00 2001 From: David Parker Date: Mon, 1 Jul 2024 16:40:28 +0100 Subject: [PATCH] [patch] Get rid of lots of unused imports --- test/test_api_actions.py | 4 ---- test/test_api_dsc_cloudant.py | 3 +-- test/{_test_api_dsc_db2.py => test_api_dsc_db2.py} | 10 ++-------- ...ventstreams.py => test_api_dsc_eventstreams.py} | 6 ++---- ...pi_dsc_postgres.py => test_api_dsc_postgres.py} | 12 ++---------- test/test_api_lec.py | 5 ----- ...test_api_registry_client_connectivity_status.py | 1 - test/test_api_registry_devices.py | 3 +-- test/test_api_registry_devices_diag.py | 2 -- test/test_api_registry_devices_diag_ec.py | 5 +---- test/test_api_registry_devices_ext.py | 3 +-- test/test_api_state_deviceState.py | 7 +------ test/test_api_state_device_types.py | 7 +------ test/test_api_state_devices.py | 6 ------ test/test_api_state_eventTypes.py | 4 ---- test/test_api_state_logical_interfaces.py | 5 ----- test/test_api_state_physical_interfaces.py | 5 ----- test/test_api_state_rules.py | 5 ----- test/test_api_state_schemas.py | 5 ----- test/test_api_state_thingState.py | 4 ---- test/test_api_state_thing_types.py | 5 ----- test/test_api_state_things.py | 6 ------ test/test_api_usage.py | 1 - test/test_application_cfg_envVars.py | 1 - test/test_codecs.py | 14 ++++++-------- test/test_codecs_json.py | 1 - test/test_codecs_utf8.py | 2 +- test/test_device.py | 4 +--- test/test_device_mgd.py | 3 --- test/test_gateway.py | 2 -- test/test_gateway_mgd.py | 2 -- test/test_state_utils.py | 7 ------- 32 files changed, 20 insertions(+), 130 deletions(-) rename test/{_test_api_dsc_db2.py => test_api_dsc_db2.py} (98%) rename test/{_test_api_dsc_eventstreams.py => test_api_dsc_eventstreams.py} (98%) rename test/{_test_api_dsc_postgres.py => test_api_dsc_postgres.py} (98%) diff --git a/test/test_api_actions.py b/test/test_api_actions.py index 68f33af9..aaef4c99 100644 --- a/test/test_api_actions.py +++ b/test/test_api_actions.py @@ -7,13 +7,9 @@ # http://www.eclipse.org/legal/epl-v10.html # ***************************************************************************** # -import uuid from datetime import datetime import testUtils import time -import pytest -from wiotp.sdk.exceptions import ApiException -import string import sys import json diff --git a/test/test_api_dsc_cloudant.py b/test/test_api_dsc_cloudant.py index e3edfd4e..b4c500cb 100644 --- a/test/test_api_dsc_cloudant.py +++ b/test/test_api_dsc_cloudant.py @@ -7,10 +7,9 @@ # http://www.eclipse.org/legal/epl-v10.html # ***************************************************************************** # -import uuid + from datetime import datetime import testUtils -import time import pytest from wiotp.sdk.api.services import CloudantServiceBindingCredentials, CloudantServiceBindingCreateRequest from wiotp.sdk.exceptions import ApiException diff --git a/test/_test_api_dsc_db2.py b/test/test_api_dsc_db2.py similarity index 98% rename from test/_test_api_dsc_db2.py rename to test/test_api_dsc_db2.py index b912e1bb..78a95ae2 100644 --- a/test/_test_api_dsc_db2.py +++ b/test/test_api_dsc_db2.py @@ -8,20 +8,14 @@ # ***************************************************************************** # -# Disabled as we don't have a Db2 instance to test with -import uuid from datetime import datetime import testUtils -import time import pytest -from wiotp.sdk.api.services import ( - CloudantServiceBindingCredentials, - CloudantServiceBindingCreateRequest, - DB2ServiceBindingCredentials, -) +from wiotp.sdk.api.services import DB2ServiceBindingCredentials from wiotp.sdk.exceptions import ApiException +@pytest.mark.skip(reason="We don't have Db2 instance to test against") @testUtils.oneJobOnlyTest class TestDscDb2(testUtils.AbstractTest): def checkDB2Service(self, service, name, description): diff --git a/test/_test_api_dsc_eventstreams.py b/test/test_api_dsc_eventstreams.py similarity index 98% rename from test/_test_api_dsc_eventstreams.py rename to test/test_api_dsc_eventstreams.py index facef8f5..ccb0b8b2 100644 --- a/test/_test_api_dsc_eventstreams.py +++ b/test/test_api_dsc_eventstreams.py @@ -6,10 +6,8 @@ # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html # ***************************************************************************** +# -# Disabled as we don't have an Event Streams instance to test with - -import uuid from datetime import datetime import pytest import testUtils @@ -18,7 +16,7 @@ from wiotp.sdk.api.services import EventStreamsServiceBindingCredentials, EventStreamsServiceBindingCreateRequest from wiotp.sdk.exceptions import ApiException - +@pytest.mark.skip(reason="We don't have an Event Streams instance to test against") @testUtils.oneJobOnlyTest class TestDscEventStreams(testUtils.AbstractTest): diff --git a/test/_test_api_dsc_postgres.py b/test/test_api_dsc_postgres.py similarity index 98% rename from test/_test_api_dsc_postgres.py rename to test/test_api_dsc_postgres.py index 1a69e947..9c0cf5a8 100644 --- a/test/_test_api_dsc_postgres.py +++ b/test/test_api_dsc_postgres.py @@ -8,22 +8,14 @@ # ***************************************************************************** # -# Disabled as we don't have a Postgres instance to test with - -import uuid from datetime import datetime import testUtils -import time import pytest -from wiotp.sdk.api.services import ( - CloudantServiceBindingCredentials, - CloudantServiceBindingCreateRequest, - PostgresServiceBindingCredentials, -) +from wiotp.sdk.api.services import PostgresServiceBindingCredentials from wiotp.sdk.exceptions import ApiException - +@pytest.mark.skip(reason="We don't have a Postgres instance to test against") @testUtils.oneJobOnlyTest class TestDscPostgres(testUtils.AbstractTest): def checkPostgresService(self, service, name, description): diff --git a/test/test_api_lec.py b/test/test_api_lec.py index bb975789..bd48ee0b 100644 --- a/test/test_api_lec.py +++ b/test/test_api_lec.py @@ -8,16 +8,11 @@ # ***************************************************************************** import base64 -import uuid -import os import json import time -import pytest import testUtils from datetime import datetime from wiotp.sdk.device import DeviceClient -from wiotp.sdk.api.registry.devices import DeviceUid, DeviceInfo, DeviceCreateRequest -from wiotp.sdk.exceptions import ApiException class TestLEC(testUtils.AbstractTest): diff --git a/test/test_api_registry_client_connectivity_status.py b/test/test_api_registry_client_connectivity_status.py index 81d3f544..7f052af6 100644 --- a/test/test_api_registry_client_connectivity_status.py +++ b/test/test_api_registry_client_connectivity_status.py @@ -7,7 +7,6 @@ # http://www.eclipse.org/legal/epl-v10.html # ***************************************************************************** -from datetime import datetime, timedelta import uuid import pytest import testUtils diff --git a/test/test_api_registry_devices.py b/test/test_api_registry_devices.py index 2b1692fd..e45b37b5 100644 --- a/test/test_api_registry_devices.py +++ b/test/test_api_registry_devices.py @@ -8,10 +8,9 @@ # ***************************************************************************** import uuid -from datetime import datetime import pytest import testUtils -from wiotp.sdk.api.registry.devices import DeviceUid, DeviceInfo, DeviceCreateRequest, DeviceLocation +from wiotp.sdk.api.registry.devices import DeviceUid, DeviceInfo, DeviceCreateRequest from wiotp.sdk.exceptions import ApiException diff --git a/test/test_api_registry_devices_diag.py b/test/test_api_registry_devices_diag.py index b334c95d..d27e7032 100644 --- a/test/test_api_registry_devices_diag.py +++ b/test/test_api_registry_devices_diag.py @@ -11,8 +11,6 @@ from datetime import datetime import pytest import testUtils -import wiotp.sdk.device -from wiotp.sdk.api.registry.devices import DeviceUid, DeviceInfo, DeviceCreateRequest, DeviceLocation, LogEntry from wiotp.sdk.api.registry.diag import DeviceLog from wiotp.sdk.exceptions import ApiException diff --git a/test/test_api_registry_devices_diag_ec.py b/test/test_api_registry_devices_diag_ec.py index 392a3699..21d00c4f 100644 --- a/test/test_api_registry_devices_diag_ec.py +++ b/test/test_api_registry_devices_diag_ec.py @@ -11,10 +11,7 @@ import time from datetime import datetime import testUtils -import wiotp.sdk.device -from wiotp.sdk.api.registry.devices import DeviceUid, DeviceInfo, DeviceCreateRequest, DeviceLocation, LogEntry -from wiotp.sdk.api.registry.diag import DeviceLog, DeviceErrorCode, DeviceErrorCodes, DeviceLogs -from wiotp.sdk.exceptions import ApiException +from wiotp.sdk.api.registry.diag import DeviceErrorCode, DeviceErrorCodes, DeviceLogs import pytest diff --git a/test/test_api_registry_devices_ext.py b/test/test_api_registry_devices_ext.py index 185a080e..0bf0a5f5 100644 --- a/test/test_api_registry_devices_ext.py +++ b/test/test_api_registry_devices_ext.py @@ -7,13 +7,12 @@ # http://www.eclipse.org/legal/epl-v10.html # ***************************************************************************** -import uuid import time from datetime import datetime import testUtils import wiotp.sdk.device -from wiotp.sdk.api.registry.devices import DeviceUid, DeviceInfo, DeviceCreateRequest, DeviceLocation, LogEntry +from wiotp.sdk.api.registry.devices import DeviceLocation, LogEntry from wiotp.sdk.exceptions import ApiException diff --git a/test/test_api_state_deviceState.py b/test/test_api_state_deviceState.py index 2026d14a..bfc288e5 100644 --- a/test/test_api_state_deviceState.py +++ b/test/test_api_state_deviceState.py @@ -8,15 +8,10 @@ # ***************************************************************************** # import uuid -from datetime import datetime import testUtils import time -import pytest -from wiotp.sdk.exceptions import ApiException -import string import json -from wiotp.sdk.api.registry.devices import DeviceUid, DeviceInfo, DeviceCreateRequest, DeviceLocation -from pip._vendor.chardet import codingstatemachine +from wiotp.sdk.api.registry.devices import DeviceInfo @testUtils.oneJobOnlyTest diff --git a/test/test_api_state_device_types.py b/test/test_api_state_device_types.py index 3bb53fe8..f2fc987c 100644 --- a/test/test_api_state_device_types.py +++ b/test/test_api_state_device_types.py @@ -7,14 +7,9 @@ # http://www.eclipse.org/legal/epl-v10.html # ***************************************************************************** # -import uuid -from datetime import datetime + import testUtils import time -import pytest -from wiotp.sdk.exceptions import ApiException -import string -import json import sys from test_state_utils import TestStateUtils diff --git a/test/test_api_state_devices.py b/test/test_api_state_devices.py index e5bfc250..77983c1c 100644 --- a/test/test_api_state_devices.py +++ b/test/test_api_state_devices.py @@ -8,14 +8,8 @@ # ***************************************************************************** # import uuid -from datetime import datetime import testUtils -import time -import pytest -from wiotp.sdk.exceptions import ApiException -import string import json -from wiotp.sdk.api.registry.devices import DeviceUid, DeviceInfo, DeviceCreateRequest, DeviceLocation @testUtils.oneJobOnlyTest diff --git a/test/test_api_state_eventTypes.py b/test/test_api_state_eventTypes.py index 98adfefd..e5518447 100644 --- a/test/test_api_state_eventTypes.py +++ b/test/test_api_state_eventTypes.py @@ -7,13 +7,9 @@ # http://www.eclipse.org/legal/epl-v10.html # ***************************************************************************** # -import uuid from datetime import datetime import testUtils import time -import pytest -from wiotp.sdk.exceptions import ApiException -import string import json diff --git a/test/test_api_state_logical_interfaces.py b/test/test_api_state_logical_interfaces.py index 6258d52d..f9800a88 100644 --- a/test/test_api_state_logical_interfaces.py +++ b/test/test_api_state_logical_interfaces.py @@ -7,13 +7,8 @@ # http://www.eclipse.org/legal/epl-v10.html # ***************************************************************************** # -import uuid from datetime import datetime import testUtils -import time -import pytest -from wiotp.sdk.exceptions import ApiException -import string import json diff --git a/test/test_api_state_physical_interfaces.py b/test/test_api_state_physical_interfaces.py index 2057cf25..247f819c 100644 --- a/test/test_api_state_physical_interfaces.py +++ b/test/test_api_state_physical_interfaces.py @@ -7,13 +7,8 @@ # http://www.eclipse.org/legal/epl-v10.html # ***************************************************************************** # -import uuid from datetime import datetime import testUtils -import time -import pytest -from wiotp.sdk.exceptions import ApiException -import string import json diff --git a/test/test_api_state_rules.py b/test/test_api_state_rules.py index 5b2be47a..fc513bed 100644 --- a/test/test_api_state_rules.py +++ b/test/test_api_state_rules.py @@ -7,13 +7,8 @@ # http://www.eclipse.org/legal/epl-v10.html # ***************************************************************************** # -import uuid from datetime import datetime import testUtils -import time -import pytest -from wiotp.sdk.exceptions import ApiException -import string import json diff --git a/test/test_api_state_schemas.py b/test/test_api_state_schemas.py index f6d83638..a8267153 100644 --- a/test/test_api_state_schemas.py +++ b/test/test_api_state_schemas.py @@ -7,13 +7,8 @@ # http://www.eclipse.org/legal/epl-v10.html # ***************************************************************************** # -import uuid from datetime import datetime import testUtils -import time -import pytest -from wiotp.sdk.exceptions import ApiException -import string import json diff --git a/test/test_api_state_thingState.py b/test/test_api_state_thingState.py index 61054277..f526d4e4 100644 --- a/test/test_api_state_thingState.py +++ b/test/test_api_state_thingState.py @@ -8,11 +8,7 @@ # ***************************************************************************** # import uuid -from datetime import datetime import testUtils -import time -import pytest -import string import json from test_state_utils import TestStateUtils diff --git a/test/test_api_state_thing_types.py b/test/test_api_state_thing_types.py index 7ea45fcb..de391a11 100644 --- a/test/test_api_state_thing_types.py +++ b/test/test_api_state_thing_types.py @@ -7,13 +7,8 @@ # http://www.eclipse.org/legal/epl-v10.html # ***************************************************************************** # -import uuid -from datetime import datetime import testUtils import time -import pytest -import string -import json import sys from test_state_utils import TestStateUtils diff --git a/test/test_api_state_things.py b/test/test_api_state_things.py index 98df5828..d9eb20a8 100644 --- a/test/test_api_state_things.py +++ b/test/test_api_state_things.py @@ -8,14 +8,8 @@ # ***************************************************************************** # import uuid -from datetime import datetime import testUtils -import time -import pytest -from wiotp.sdk.exceptions import ApiException -import string import json -from wiotp.sdk.api.registry.devices import DeviceUid, DeviceInfo, DeviceCreateRequest, DeviceLocation from test_state_utils import TestStateUtils diff --git a/test/test_api_usage.py b/test/test_api_usage.py index 66cdc306..e1f18bb2 100644 --- a/test/test_api_usage.py +++ b/test/test_api_usage.py @@ -8,7 +8,6 @@ # ***************************************************************************** from datetime import date, timedelta, datetime -import pytest import testUtils from wiotp.sdk.api.usage import DayDataTransfer, DataTransferSummary diff --git a/test/test_application_cfg_envVars.py b/test/test_application_cfg_envVars.py index 28807007..9a08e2fc 100644 --- a/test/test_application_cfg_envVars.py +++ b/test/test_application_cfg_envVars.py @@ -7,7 +7,6 @@ # http://www.eclipse.org/legal/epl-v10.html # ***************************************************************************** -import uuid import os import testUtils import wiotp.sdk.application diff --git a/test/test_codecs.py b/test/test_codecs.py index 33c200f3..9ea89020 100644 --- a/test/test_codecs.py +++ b/test/test_codecs.py @@ -7,8 +7,6 @@ # http://www.eclipse.org/legal/epl-v10.html # ***************************************************************************** -import copy - import wiotp.sdk import pytz @@ -23,12 +21,12 @@ class MyCodec(wiotp.sdk.MessageCodec): def encode(data=None, timestamp=None): """ Dedicated encoder for supporting a very specific dataset, serialises a dictionary object - of the following format: + of the following format: { - 'hello' : 'world', + 'hello' : 'world', 'x' : 10 } - + into a simple comma-seperated message: world,10 """ @@ -37,14 +35,14 @@ def encode(data=None, timestamp=None): @staticmethod def decode(message): """ - The decoder understands the comma-seperated format produced by the encoder and + The decoder understands the comma-seperated format produced by the encoder and allocates the two values to the correct keys: - + data['hello'] = 'world' data['x'] = 10 The MQTT message is a byte array, after splitting it convert to string and int - + """ (hello, x) = message.payload.decode("utf-8").split(",") diff --git a/test/test_codecs_json.py b/test/test_codecs_json.py index a47bf35b..fc611a67 100644 --- a/test/test_codecs_json.py +++ b/test/test_codecs_json.py @@ -9,7 +9,6 @@ import json -import os import testUtils import pytest diff --git a/test/test_codecs_utf8.py b/test/test_codecs_utf8.py index 534313c9..d95ccc6a 100644 --- a/test/test_codecs_utf8.py +++ b/test/test_codecs_utf8.py @@ -11,7 +11,7 @@ import os import testUtils -from wiotp.sdk import InvalidEventException, Utf8Codec +from wiotp.sdk import Utf8Codec class NonJsonDummyPahoMessage(object): diff --git a/test/test_device.py b/test/test_device.py index 80cfa2f0..d77efbfa 100644 --- a/test/test_device.py +++ b/test/test_device.py @@ -7,13 +7,11 @@ # http://www.eclipse.org/legal/epl-v10.html # ***************************************************************************** -import copy -import uuid import testUtils import pytest import wiotp.sdk.device import wiotp.sdk.application -from wiotp.sdk.exceptions import ApiException, ConnectionException, MissingMessageEncoderException +from wiotp.sdk.exceptions import ConnectionException, MissingMessageEncoderException class TestDevice(testUtils.AbstractTest): diff --git a/test/test_device_mgd.py b/test/test_device_mgd.py index f7496888..f03d030e 100644 --- a/test/test_device_mgd.py +++ b/test/test_device_mgd.py @@ -9,10 +9,7 @@ import pytest import testUtils -import uuid -import os import wiotp.sdk -import time from wiotp.sdk.device import ManagedDeviceClient from wiotp.sdk import Utf8Codec diff --git a/test/test_gateway.py b/test/test_gateway.py index 94a80b99..7cc34562 100644 --- a/test/test_gateway.py +++ b/test/test_gateway.py @@ -7,8 +7,6 @@ # http://www.eclipse.org/legal/epl-v10.html # ***************************************************************************** -import uuid -import time import pytest import testUtils import wiotp.sdk.gateway diff --git a/test/test_gateway_mgd.py b/test/test_gateway_mgd.py index 75578439..7495ea32 100644 --- a/test/test_gateway_mgd.py +++ b/test/test_gateway_mgd.py @@ -7,13 +7,11 @@ # http://www.eclipse.org/legal/epl-v10.html # ***************************************************************************** -import uuid import pytest import testUtils import wiotp.sdk from wiotp.sdk.gateway import ManagedGatewayClient from wiotp.sdk import Utf8Codec -import unittest class TestGatewayMgd(testUtils.AbstractTest): diff --git a/test/test_state_utils.py b/test/test_state_utils.py index b62f9bc1..a08b0230 100644 --- a/test/test_state_utils.py +++ b/test/test_state_utils.py @@ -7,15 +7,8 @@ # http://www.eclipse.org/legal/epl-v10.html # ***************************************************************************** # -import uuid from datetime import datetime -import testUtils -import time -import pytest -from wiotp.sdk.exceptions import ApiException -import string import json -from wiotp.sdk.api.registry.devices import DeviceUid, DeviceInfo, DeviceCreateRequest, DeviceLocation import sys