small tweaks and add a test

Author: raman325

custom_components/pyscript/__init__.py

@@ -44,12 +44,12 @@
 if sys.version_info[:2] >= (3, 8):
     from importlib.metadata import (  # pylint: disable=no-name-in-module,import-error
         PackageNotFoundError,
-        version,
+        version as installed_version,
     )
 else:
     from importlib_metadata import (  # pylint: disable=import-error
         PackageNotFoundError,
-        version,
+        version as installed_version,
     )
 
 _LOGGER = logging.getLogger(LOGGER_PATH)
@@ -280,13 +280,14 @@ async def install_requirements(hass):
                 # https://rosettacode.org/wiki/Strip_comments_from_a_string#Python
                 i = pkg.find("#")
                 if i >= 0:
-                    pkg = pkg[:i].strip()
+                    pkg = pkg[:i]
+                pkg = pkg.strip()
 
                 try:
                     # Attempt to get version of package. Do nothing if it's found since
                     # we want to use the version that's already installed to be safe
                     requirement = pkg_resources.Requirement.parse(pkg)
-                    requirement_installed_version = version(requirement.project_name)
+                    requirement_installed_version = installed_version(requirement.project_name)
 
                     if requirement_installed_version in requirement:
                         _LOGGER.debug("`%s` already found", requirement.project_name)
@@ -307,7 +308,7 @@ async def install_requirements(hass):
                     # Not valid requirements line so it can be skipped
                     _LOGGER.debug("Ignoring `%s` because it is not a valid package", pkg)
             if requirements_to_install:
-                _LOGGER.info("Installing the following packages: %s", ",".join(requirements_to_install))
+                _LOGGER.info("Installing the following packages: %s", ", ".join(requirements_to_install))
                 await async_process_requirements(hass, DOMAIN, requirements_to_install)
             else:
                 _LOGGER.info("All requirements are already available.")

tests/test_init.py

@@ -482,3 +482,27 @@ async def test_misc_errors(hass, caplog):
     assert "State class is not meant to be instantiated" in caplog.text
     assert "Event class is not meant to be instantiated" in caplog.text
     assert "TrigTime class is not meant to be instantiated" in caplog.text
+
+
+async def test_install_requirements(hass):
+    """Test install_requirements function."""
+    requirements = """
+pytube==9.7.0
+# another test comment
+pykakasi==2.0.1 # test comment
+
+"""
+
+    with patch("os.path.exists", return_value=True), patch(
+        "custom_components.pyscript.async_hass_config_yaml", return_value={}
+    ), patch("custom_components.pyscript.open", mock_open(read_data=requirements), create=True,), patch(
+        "custom_components.pyscript.async_process_requirements"
+    ) as install_requirements:
+        await setup_script(hass, None, dt(2020, 7, 1, 11, 59, 59, 999999), "")
+        assert install_requirements.call_args[0][2] == ["pytube==9.7.0", "pykakasi==2.0.1"]
+        install_requirements.reset_mock()
+        # Because in tests, packages are not installed, we fake that they are
+        # installed so we can test that we don't attempt to install them
+        with patch("custom_components.pyscript.installed_version", return_value="2.0.1"):
+            await hass.services.async_call("pyscript", "reload", {}, blocking=True)
+            assert not install_requirements.called