kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Addon Manager: Black and lint

Browse Source
This commit is contained in:
Chris Hennes
2023-03-31 13:46:13 -05:00
parent 43ee59c82f
commit 8b31d7deb0
19 changed files with 146 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Mod/AddonManager/AddonManagerTest/app/test_addon.py
View File

@@ -36,9 +36,7 @@ class TestAddon(unittest.TestCase):
MODULE = "test_addon" # file name without extension
def setUp(self):
self.test_dir = os.path.join(
os.path.dirname(__file__), "..", "data"
)
self.test_dir = os.path.join(os.path.dirname(__file__), "..", "data")
def test_display_name(self):
@@ -178,7 +176,8 @@ class TestAddon(unittest.TestCase):
self.assertEqual(addon.repo_type, Addon.Kind.MACRO)
self.assertEqual(addon.name, "DoNothing")
self.assertEqual(
addon.macro.comment, "Do absolutely nothing. For Addon Manager integration tests."
addon.macro.comment,
"Do absolutely nothing. For Addon Manager integration tests.",
)
self.assertEqual(addon.url, "https://github.com/FreeCAD/FreeCAD")
self.assertEqual(addon.macro.version, "1.0")

4
src/Mod/AddonManager/AddonManagerTest/app/test_installer.py
View File

@@ -116,7 +116,9 @@ class TestAddonInstaller(unittest.TestCase):
os.path.join(self.test_data_dir, "good_package.xml"),
os.path.join(addon_dir, "package.xml"),
)
good_metadata = MetadataReader.from_file(os.path.join(addon_dir, "package.xml"))
good_metadata = MetadataReader.from_file(
os.path.join(addon_dir, "package.xml")
)
installer._update_metadata()
self.assertEqual(self.real_addon.installed_version, good_metadata.version)

31
src/Mod/AddonManager/AddonManagerTest/app/test_metadata.py
View File

@@ -204,9 +204,13 @@ class TestUrlType(unittest.TestCase):
class TestMetadataAuxiliaryFunctions(unittest.TestCase):
def test_get_first_supported_freecad_version_simple(self):
from addonmanager_metadata import Metadata, Version, get_first_supported_freecad_version
from addonmanager_metadata import (
Metadata,
Version,
get_first_supported_freecad_version,
)
expected_result = Version(from_string="0.20.2beta")
metadata = self.given_metadata_with_freecadmin_set(expected_result)
first_version = get_first_supported_freecad_version(metadata)
@@ -215,12 +219,18 @@ class TestMetadataAuxiliaryFunctions(unittest.TestCase):
@staticmethod
def given_metadata_with_freecadmin_set(min_version):
from addonmanager_metadata import Metadata
metadata = Metadata()
metadata.freecadmin = min_version
return metadata
def test_get_first_supported_freecad_version_with_content(self):
from addonmanager_metadata import Metadata, Version, get_first_supported_freecad_version
from addonmanager_metadata import (
Metadata,
Version,
get_first_supported_freecad_version,
)
expected_result = Version(from_string="0.20.2beta")
metadata = self.given_metadata_with_freecadmin_in_content(expected_result)
first_version = get_first_supported_freecad_version(metadata)
@@ -229,17 +239,24 @@ class TestMetadataAuxiliaryFunctions(unittest.TestCase):
@staticmethod
def given_metadata_with_freecadmin_in_content(min_version):
from addonmanager_metadata import Metadata, Version
v_list = min_version.version_as_list
metadata = Metadata()
wb1 = Metadata()
wb1.freecadmin = Version(from_list=[v_list[0]+1,v_list[1],v_list[2],v_list[3]])
wb1.freecadmin = Version(
from_list=[v_list[0] + 1, v_list[1], v_list[2], v_list[3]]
)
wb2 = Metadata()
wb2.freecadmin = Version(from_list=[v_list[0],v_list[1]+1,v_list[2],v_list[3]])
wb2.freecadmin = Version(
from_list=[v_list[0], v_list[1] + 1, v_list[2], v_list[3]]
)
wb3 = Metadata()
wb3.freecadmin = Version(from_list=[v_list[0],v_list[1],v_list[2]+1,v_list[3]])
wb3.freecadmin = Version(
from_list=[v_list[0], v_list[1], v_list[2] + 1, v_list[3]]
)
m1 = Metadata()
m1.freecadmin = min_version
metadata.content = {"workbench":[wb1,wb2,wb3],"macro":[m1]}
metadata.content = {"workbench": [wb1, wb2, wb3], "macro": [m1]}
return metadata