Fix tests to add depends option

ubuntu · Sep 4, 2020 · 9d70cf3 · 9d70cf3
1 parent 20a5fe5
commit 9d70cf3
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 4 deletions.
diff --git a/tests/data/duplicatedframeworks/category.py b/tests/data/duplicatedframeworks/category.py
@@ -41,6 +41,9 @@ def setup(self, install_path=None, auto_accept_license=False):
     def remove(self):
         super().remove()
 
+    def depends(self):
+        super().depends()
+
 
 class FrameworkB(umake.frameworks.BaseFramework):
 
@@ -53,3 +56,6 @@ def setup(self, install_path=None, auto_accept_license=False):
 
     def remove(self):
         super().remove()
+
+    def depends(self):
+        super().depends()
diff --git a/tests/data/duplicatedframeworks/samecategory.py b/tests/data/duplicatedframeworks/samecategory.py
@@ -41,6 +41,9 @@ def setup(self, install_path=None, auto_accept_license=False):
     def remove(self):
         super().remove()
 
+    def depends(self):
+        super().depends()
+
 
 class FrameworkD(umake.frameworks.BaseFramework):
 
@@ -53,3 +56,6 @@ def setup(self, install_path=None, auto_accept_license=False):
 
     def remove(self):
         super().remove()
+
+    def depends(self):
+        super().depends()
diff --git a/tests/data/multipledefaultsframeworks/defaultframeworkformain.py b/tests/data/multipledefaultsframeworks/defaultframeworkformain.py
@@ -34,3 +34,6 @@ def setup(self, install_path=None, auto_accept_license=False):
 
     def remove(self):
         super().remove()
+
+    def depends(self):
+        super().depends()
diff --git a/tests/data/multipledefaultsframeworks/twodefaultscategory.py b/tests/data/multipledefaultsframeworks/twodefaultscategory.py
@@ -41,6 +41,9 @@ def setup(self, install_path=None, auto_accept_license=False):
     def remove(self):
         super().remove()
 
+    def depends(self):
+        super().depends()
+
 
 class FrameworkB(umake.frameworks.BaseFramework):
 
@@ -53,3 +56,6 @@ def setup(self, install_path=None, auto_accept_license=False):
 
     def remove(self):
         super().remove()
+
+    def depends(self):
+        super().depends()
diff --git a/tests/data/overlayframeworks/duplicatedcategory.py b/tests/data/overlayframeworks/duplicatedcategory.py
@@ -41,6 +41,9 @@ def setup(self, install_path=None, auto_accept_license=False):
     def remove(self):
         super().remove()
 
+    def depends(self):
+        super().depends()
+
 
 class FrameworkB(umake.frameworks.BaseFramework):
 
@@ -53,3 +56,6 @@ def setup(self, install_path=None, auto_accept_license=False):
 
     def remove(self):
         super().remove()
+
+    def depends(self):
+        super().depends()
diff --git a/tests/data/overlayframeworks/duplicatedcategory2.py b/tests/data/overlayframeworks/duplicatedcategory2.py
@@ -41,6 +41,9 @@ def setup(self, install_path=None, auto_accept_license=False):
     def remove(self):
         super().remove()
 
+    def depends(self):
+        super().depends()
+
 
 class FrameworkB(umake.frameworks.BaseFramework):
 
@@ -53,3 +56,6 @@ def setup(self, install_path=None, auto_accept_license=False):
 
     def remove(self):
         super().remove()
+
+    def depends(self):
+        super().depends()
diff --git a/tests/data/overlayframeworks/overlayframeworks.py b/tests/data/overlayframeworks/overlayframeworks.py
@@ -41,6 +41,9 @@ def setup(self, install_path=None, auto_accept_license=False):
     def remove(self):
         super().remove()
 
+    def depends(self):
+        super().depends()
+
 
 class FrameworkB(umake.frameworks.BaseFramework):
 
@@ -53,3 +56,6 @@ def setup(self, install_path=None, auto_accept_license=False):
 
     def remove(self):
         super().remove()
+
+    def depends(self):
+        super().depends()
diff --git a/tests/data/overlayframeworks/withcategory.py b/tests/data/overlayframeworks/withcategory.py
@@ -41,6 +41,9 @@ def setup(self, install_path=None, auto_accept_license=False):
     def remove(self):
         super().remove()
 
+    def depends(self):
+        super().depends()
+
 
 class FrameworkB(umake.frameworks.BaseFramework):
 
@@ -53,3 +56,6 @@ def setup(self, install_path=None, auto_accept_license=False):
 
     def remove(self):
         super().remove()
+
+    def depends(self):
+        super().depends()
diff --git a/tests/data/overlayframeworks/withcategory2.py b/tests/data/overlayframeworks/withcategory2.py
@@ -41,6 +41,9 @@ def setup(self, install_path=None, auto_accept_license=False):
     def remove(self):
         super().remove()
 
+    def depends(self):
+        super().depends()
+
 
 class FrameworkB(umake.frameworks.BaseFramework):
 
@@ -53,3 +56,6 @@ def setup(self, install_path=None, auto_accept_license=False):
 
     def remove(self):
         super().remove()
+
+    def depends(self):
+        super().depends()
diff --git a/tests/small/test_frameworks_loader.py b/tests/small/test_frameworks_loader.py
@@ -297,6 +297,7 @@ def test_parse_category_and_framework_run_correct_framework(self):
         args.framework = "framework-b"
         args.accept_license = False
         args.remove = False
+        args.depends = False
         with patch.object(self.CategoryHandler.categories[args.category].frameworks["framework-b"], "setup")\
                 as setup_call:
             self.CategoryHandler.categories[args.category].run_for(args)
@@ -312,6 +313,7 @@ def test_parse_no_framework_run_default_for_category(self):
         args.framework = None
         args.accept_license = False
         args.remove = False
+        args.depends = False
         with patch.object(self.CategoryHandler.categories[args.category].frameworks["framework-a"], "setup")\
                 as setup_call:
             self.CategoryHandler.categories[args.category].run_for(args)
@@ -327,11 +329,11 @@ def test_parse_category_and_framework_list_dependencies(self):
         args.depends = True
         args.accept_license = False
         args.remove = False
-        with patch.object(self.CategoryHandler.categories[args.category].frameworks["framework-a"], "depends")\
+        with patch.object(self.CategoryHandler.categories[args.category].frameworks["framework-b"], "depends")\
                 as depends_call:
             self.CategoryHandler.categories[args.category].run_for(args)
             self.assertTrue(depends_call.called)
-            remove_call.assert_called_with()
+            depends_call.assert_called_with()
             # self.assertEqual(setup_call.call_args, call(install_path=None, auto_accept_license=False))
 
     def test_parse_category_and_framework_run_correct_remove_framework(self):
@@ -393,6 +395,7 @@ def test_parse_category_and_framework_cannot_install_not_installable_but_install
         args.framework = "framework-r-installed-not-installable"
         args.accept_license = False
         args.remove = False
+        args.depends = False
         self.assertRaises(BaseException, self.CategoryHandler.categories[args.category].run_for, args)
 
     def test_parse_category_and_framework_can_remove_not_installable_but_installed_framework(self):
@@ -418,6 +421,7 @@ def test_parse_category_and_framework_get_accept_license_arg(self):
         args.framework = "framework-b"
         args.accept_license = True
         args.remove = False
+        args.depends = False
         with patch.object(self.CategoryHandler.categories[args.category].frameworks["framework-b"], "setup")\
                 as setup_call:
             self.CategoryHandler.categories[args.category].run_for(args)
@@ -1305,6 +1309,9 @@ def setup(self):
         def remove(self):
             super().remove()
 
+        def depends(self):
+            super().depends()
+
         @property
         def is_installable(self):
             return False

diff --git a/umake/frameworks/__init__.py b/umake/frameworks/__init__.py
@@ -34,7 +34,6 @@
 from umake.settings import DEFAULT_INSTALL_TOOLS_PATH, UMAKE_FRAMEWORKS_ENVIRON_VARIABLE, DEFAULT_BINARY_LINK_PATH
 from umake.tools import ConfigHandler, NoneDict, classproperty, get_current_arch, get_current_distro_version,\
     is_completion_mode, switch_to_current_user, MainLoop, get_user_frameworks_path, get_current_distro_id
-from umake.interactions import DisplayMessage
 from umake.ui import UI
 
 
@@ -267,7 +266,7 @@ def setup(self):
     @abc.abstractmethod
     def depends(self):
         """Method call to list depends for current framework"""
-        if not self.is_installable:
+        if not self.is_installable and not self.is_installed:
             logger.error(_("Framework {} is not installable".format(self.name)))
             UI.return_main_screen(status_code=2)