fix mqtt test

mikey0000 · Jul 25, 2024 · 87eb521 · 87eb521
1 parent 94326a8
commit 87eb521
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pymammotion/__init__.py b/pymammotion/__init__.py
@@ -14,7 +14,7 @@
 
 # TODO make a working device that will work outside HA too.
 from pymammotion.mammotion.devices import MammotionBaseBLEDevice
-from pymammotion.mqtt.mqtt import LubaMQTT, logger
+from pymammotion.mqtt import MammotionMQTT
 
 # TODO provide interface to pick between mqtt/cloud/bluetooth
 
@@ -28,7 +28,7 @@
     CLIENT_ID = os.environ.get("CLIENT_ID")
     IOT_TOKEN = os.environ.get("IOT_TOKEN")
     REGION = os.environ.get("REGION")
-    luba = LubaMQTT(
+    luba = MammotionMQTT(
         iot_token=IOT_TOKEN,
         region_id=REGION,
         product_key=PRODUCT_KEY,

diff --git a/pymammotion/aliyun/dataclass/dev_by_account_response.py b/pymammotion/aliyun/dataclass/dev_by_account_response.py
@@ -6,10 +6,8 @@
 
 @dataclass
 class Device(DataClassORJSONMixin):
-    productModel: str
     gmtModified: int
     netType: str
-    nickName: str
     categoryKey: str
     productKey: str
     nodeType: str
@@ -24,6 +22,8 @@ class Device(DataClassORJSONMixin):
     identityId: str
     thingType: str
     status: int
+    nickName: Optional[str] = None
+    productModel: Optional[str] = None
     productImage: Optional[str] = None
     categoryImage: Optional[str] = None
 

diff --git a/tests/login_and_mqtt_test.py b/tests/login_and_mqtt_test.py
@@ -8,7 +8,7 @@
 from pymammotion.aliyun.cloud_gateway import CloudIOTGateway
 from pymammotion.const import MAMMOTION_DOMAIN
 from pymammotion.mammotion.commands.mammotion_command import MammotionCommand
-from pymammotion.mqtt.mammotion_mqtt import MammotionMQTT, logger
+from pymammotion.mqtt import MammotionMQTT
 from pymammotion.mammotion.devices.mammotion import MammotionBaseCloudDevice
 
 logger = logging.getLogger(__name__)