refactor function and add test

This commit is contained in:
n3hrox
2019-10-27 22:25:27 +01:00
parent 03a2f284e2
commit 752e584a9b
2 changed files with 19 additions and 5 deletions
+9 -5
View File
@@ -156,15 +156,15 @@ class Updater(object): # pragma: no cover
return output.read().lower()
@staticmethod
def _get_conda(path):
return "conda" if "conda" in path else None
def _is_conda(path):
return "conda" in path
def _get_linux(self):
import distro
if not is_binary():
dvc_path = self._get_dvc_path("linux")
return self._get_conda(dvc_path) or "pip"
return "conda" if self._is_conda(dvc_path) else "pip"
package_managers = {
"rhel": "yum",
@@ -195,7 +195,8 @@ class Updater(object): # pragma: no cover
package_manager = "formula"
dvc_path = self._get_dvc_path("darwin")
package_manager = package_manager or self._get_conda(dvc_path)
if self._is_conda(dvc_path):
package_manager = "conda"
return package_manager or "pip"
@@ -204,7 +205,10 @@ class Updater(object): # pragma: no cover
return None
dvc_path = self._get_dvc_path("windows")
return self._get_conda(dvc_path) or "pip"
if self._is_conda(dvc_path):
return "conda"
return "pip"
def _get_package_manager(self):
import platform
+10
View File
@@ -49,3 +49,13 @@ def test_check_version_outdated(updater):
updater.current = "0.20.8"
assert updater._is_outdated()
@mock.patch("dvc.updater.Updater._is_conda")
def test_check_dvc_from_conda(mocked_is_conda, updater):
mocked_is_conda.return_value = True
updater.latest = "0.21.0"
updater.current = "0.20.8"
msg = "Run {yellow}conda{reset} {update}update{reset} dvc"
assert updater._get_update_instructions() == msg