From 2eb6f16a94a4e15a7b0087b3cc9a649bd2540613 Mon Sep 17 00:00:00 2001
From: Martin Hjelmare <marhje52@gmail.com>
Date: Tue, 8 Jun 2021 20:24:54 +0200
Subject: [PATCH] Fix mysensors awesomeversion strategy usage (#51627)

* Update awesomeversion strategy use in mysensors

* Remove default version
---
 .../components/mysensors/config_flow.py          | 16 +++++++---------
 tests/components/mysensors/test_config_flow.py   | 12 ++----------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/homeassistant/components/mysensors/config_flow.py b/homeassistant/components/mysensors/config_flow.py
index 1abf45dd60f..920cb40b7ab 100644
--- a/homeassistant/components/mysensors/config_flow.py
+++ b/homeassistant/components/mysensors/config_flow.py
@@ -1,7 +1,6 @@
 """Config flow for MySensors."""
 from __future__ import annotations
 
-from contextlib import suppress
 import logging
 import os
 from typing import Any
@@ -55,7 +54,6 @@ def _get_schema_common(user_input: dict[str, str]) -> dict:
     schema = {
         vol.Required(
             CONF_VERSION,
-            default="",
             description={
                 "suggested_value": user_input.get(CONF_VERSION, DEFAULT_VERSION)
             },
@@ -67,14 +65,14 @@ def _get_schema_common(user_input: dict[str, str]) -> dict:
 
 def _validate_version(version: str) -> dict[str, str]:
     """Validate a version string from the user."""
-    version_okay = False
-    with suppress(AwesomeVersionStrategyException):
-        version_okay = bool(
-            AwesomeVersion.ensure_strategy(
-                version,
-                [AwesomeVersionStrategy.SIMPLEVER, AwesomeVersionStrategy.SEMVER],
-            )
+    version_okay = True
+    try:
+        AwesomeVersion(
+            version,
+            [AwesomeVersionStrategy.SIMPLEVER, AwesomeVersionStrategy.SEMVER],
         )
+    except AwesomeVersionStrategyException:
+        version_okay = False
 
     if version_okay:
         return {}
diff --git a/tests/components/mysensors/test_config_flow.py b/tests/components/mysensors/test_config_flow.py
index ddefd55457f..daee8a37eba 100644
--- a/tests/components/mysensors/test_config_flow.py
+++ b/tests/components/mysensors/test_config_flow.py
@@ -264,16 +264,6 @@ async def test_fail_to_connect(hass: HomeAssistant) -> None:
             CONF_VERSION,
             "invalid_version",
         ),
-        (
-            CONF_GATEWAY_TYPE_TCP,
-            "gw_tcp",
-            {
-                CONF_TCP_PORT: 5003,
-                CONF_DEVICE: "127.0.0.1",
-            },
-            CONF_VERSION,
-            "invalid_version",
-        ),
         (
             CONF_GATEWAY_TYPE_TCP,
             "gw_tcp",
@@ -302,6 +292,7 @@ async def test_fail_to_connect(hass: HomeAssistant) -> None:
             {
                 CONF_TCP_PORT: 5003,
                 CONF_DEVICE: "127.0.0.",
+                CONF_VERSION: "2.4",
             },
             CONF_DEVICE,
             "invalid_ip",
@@ -312,6 +303,7 @@ async def test_fail_to_connect(hass: HomeAssistant) -> None:
             {
                 CONF_TCP_PORT: 5003,
                 CONF_DEVICE: "abcd",
+                CONF_VERSION: "2.4",
             },
             CONF_DEVICE,
             "invalid_ip",