From 080877e41347b8987977fc8cc3ec90dcd149651a Mon Sep 17 00:00:00 2001 From: Raman Tenneti Date: Tue, 9 Mar 2021 15:19:06 -0800 Subject: superproject: pass groups to ToXml method. Added the following methods to XmlManifest class. + GetDefaultGroupsStr() - return 'default,platform-' + platform.system().lower() + GetGroupsStr() - Same as gitc_utils.py's _manifest_groups func. + Replaced gitc_utils.py's_manifest_groups calls with GetGroupsStr. + Used the above methods to get groups in command.py::GetProjects and part of init.py. TODO: clean up these funcs to take structured group data more instead of passing strings around everywhere that need parsing. Tested the code with the following commands. $ ./run_tests -v Tested the sync code by using repo_dev alias and pointing to this CL and verified prebuilts/fullsdk-linux directory has all the folders. Tested repo init and repo sync with --use-superproject and without --use-superproject argument. $ repo_dev init -u sso://android.git.corp.google.com/platform/manifest -b androidx-main --partial-clone --clone-filter=blob:limit=10M --repo-rev=main --use-superproject $ repo_dev sync -c -j32 Bug: [google internal] b/181804931 Bug: https://crbug.com/gerrit/13707 Change-Id: Ia98585cbfa3a1449710655af55d56241794242b6 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/299422 Reviewed-by: Jonathan Nieder Reviewed-by: Mike Frysinger Tested-by: Raman Tenneti --- tests/test_manifest_xml.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tests/test_manifest_xml.py') diff --git a/tests/test_manifest_xml.py b/tests/test_manifest_xml.py index 6977b417..9060ef3d 100644 --- a/tests/test_manifest_xml.py +++ b/tests/test_manifest_xml.py @@ -15,6 +15,7 @@ """Unittests for the manifest_xml.py module.""" import os +import platform import shutil import tempfile import unittest @@ -377,6 +378,11 @@ class ProjectElementTests(ManifestParseTestCase): self.assertCountEqual( result['extras'], ['g1', 'g2', 'g1', 'name:extras', 'all', 'path:path']) + groupstr = 'default,platform-' + platform.system().lower() + self.assertEqual(groupstr, manifest.GetGroupsStr()) + groupstr = 'g1,g2,g1' + manifest.manifestProject.config.SetString('manifest.groups', groupstr) + self.assertEqual(groupstr, manifest.GetGroupsStr()) def test_set_revision_id(self): """Check setting of project's revisionId.""" -- cgit v1.2.3-54-g00ecf