Improve argument name, sort arguments

Author: bouwew

tests/test_init.py

@@ -92,10 +92,10 @@ async def load_testdata(
     def setup_app(
         self,
         broken=False,
-        timeout_happened=False,
-        raise_timeout=False,
         fail_auth=False,
+        raise_timeout=False,
         stretch=False,
+        timeout_happened=False,
     ):
         """Create mock webserver for Smile to interface with."""
         app = aiohttp.web.Application()
@@ -135,10 +135,10 @@ def setup_app(
     def setup_legacy_app(
         self,
         broken=False,
-        timeout_happened=False,
-        raise_timeout=False,
         fail_auth=False,
+        raise_timeout=False,
         stretch=False,
+        timeout_happened=False,
     ):
         """Create mock webserver for Smile to interface with."""
         app = aiohttp.web.Application()
@@ -264,7 +264,7 @@ async def smile_fail_auth(cls, request):
         raise aiohttp.web.HTTPUnauthorized()
 
     @staticmethod
-    def connect_status(broken, timeout_happened, fail_auth):
+    def connect_status(broken, fail_auth, timeout_happened):
         """Determine assumed status from settings."""
         assumed_status = 200
         if broken:
@@ -279,11 +279,11 @@ async def connect(
         self,
         function,
         broken=False,
-        timeout_happened=False,
-        raise_timeout=False,
-        real_timeout_value=10,
         fail_auth=False,
+        raise_timeout=False,
+        smile_timeout_value=10,
         stretch=False,
+        timeout_happened=False,
         url_part=CORE_DOMAIN_OBJECTS,
     ):
         """Connect to a smile environment and perform basic asserts."""
@@ -293,7 +293,7 @@ async def connect(
         )
 
         # Happy flow
-        app = function(broken, timeout_happened, raise_timeout, fail_auth, stretch)
+        app = function(broken, fail_auth, raise_timeout, stretch, timeout_happened)
 
         server = aiohttp.test_utils.TestServer(
             app, port=port, scheme="http", host="127.0.0.1"
@@ -308,7 +308,7 @@ async def connect(
         # Try/exceptpass to accommodate for Timeout of aoihttp
         try:
             resp = await websession.get(url)
-            assumed_status = self.connect_status(broken, timeout_happened, fail_auth)
+            assumed_status = self.connect_status(broken, fail_auth, timeout_happened)
             assert resp.status == assumed_status
             timeoutpass_result = False
             assert timeoutpass_result
@@ -351,7 +351,7 @@ async def connect(
         try:
             smile_version = await smile.connect()
             assert smile_version is not None
-            assert smile._timeout == real_timeout_value
+            assert smile._timeout == smile_timeout_value
             return server, smile, client
         except (
             pw_exceptions.ConnectionFailedError,
@@ -409,15 +409,15 @@ async def connect_legacy_wrapper(
             return await self.connect(
                 self.setup_legacy_app,
                 raise_timeout=True,
-                real_timeout_value=30,
+                smile_timeout_value=30,
                 url_part=CORE_LOCATIONS,
             )
 
         try:
             _LOGGER.warning("Connecting to device exceeding timeout in response:")
             await self.connect(
                 self.setup_legacy_app,
-                real_timeout_value=30,
+                smile_timeout_value=30,
                 timeout_happened=True,
                 url_part=CORE_LOCATIONS,
             )
@@ -431,7 +431,7 @@ async def connect_legacy_wrapper(
             await self.connect(
                 self.setup_legacy_app,
                 broken=True,
-                real_timeout_value=30,
+                smile_timeout_value=30,
                 url_part=CORE_LOCATIONS,
             )
             _LOGGER.error(" - broken information not handled")  # pragma: no cover
@@ -442,7 +442,7 @@ async def connect_legacy_wrapper(
         _LOGGER.info("Connecting to functioning device:")
         return await self.connect(
             self.setup_legacy_app,
-            real_timeout_value=30,
+            smile_timeout_value=30,
             stretch=stretch,
             url_part=CORE_LOCATIONS,
         )