Cleanup

Author: CoMPaTech

plugwise/smile.py

@@ -169,7 +169,8 @@ async def connect(self):
                     except InvalidXMLError:  # pragma: no cover
                         # Corner case check
                         raise ConnectionFailedError
-                else:
+                else:  # pragma: no cover
+                    # No cornercase, just end of the line
                     _LOGGER.error("Connected but no gateway device information found")
                     raise ConnectionFailedError
 

tests/test_smile.py

@@ -278,7 +278,8 @@ async def connect_wrapper(self, raise_timeout=False, fail_auth=False):
                 _LOGGER.error(" - invalid credentials not handled")
                 raise self.ConnectError
             except pw_exceptions.InvalidAuthentication:
-                _LOGGER.info(" + successfully passed credentials handling.")
+                _LOGGER.info(" + successfully aborted on credentials missing.")
+                raise pw_exceptions.InvalidAuthentication
 
         if raise_timeout:
             _LOGGER.warning("Connecting to device exceeding timeout in handling:")
@@ -1486,18 +1487,14 @@ async def test_invalid_credentials(self):
             await self.connect_wrapper(fail_auth=True)
             assert False
         except pw_exceptions.InvalidAuthentication:
-            _LOGGER.debug("InvalidAuthentication raised")
-            assert True
-        except Exception as exception:
-            _LOGGER.debug("Other")
-            _LOGGER.debug(format(exception))
+            _LOGGER.debug("InvalidAuthentication raised successfully")
             assert True
 
     @pytest.mark.asyncio
-    async def test_connect_p1vfail(self):
+    async def test_connect_fail_firmware(self):
         """Test a P1 non existing firmware setup."""
 
-        self.smile_setup = "p1vfail"
+        self.smile_setup = "fail_firmware"
         try:
             await self.connect_wrapper()
         except pw_exceptions.UnsupportedDeviceError: