diff options
author | Raman Tenneti <rtenneti@google.com> | 2021-03-09 15:19:06 -0800 |
---|---|---|
committer | Raman Tenneti <rtenneti@google.com> | 2021-03-11 01:24:52 +0000 |
commit | 080877e41347b8987977fc8cc3ec90dcd149651a (patch) | |
tree | 57a8c76bd02da5f9400cdec5da6a75f4e4f2d3f2 /tests/test_manifest_xml.py | |
parent | 9888accb0cf2c17e0f4bbc399782ccd2a4be0196 (diff) | |
download | git-repo-080877e41347b8987977fc8cc3ec90dcd149651a.tar.gz |
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 <jrn@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
Tested-by: Raman Tenneti <rtenneti@google.com>
Diffstat (limited to 'tests/test_manifest_xml.py')
-rw-r--r-- | tests/test_manifest_xml.py | 6 |
1 files changed, 6 insertions, 0 deletions
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 @@ | |||
15 | """Unittests for the manifest_xml.py module.""" | 15 | """Unittests for the manifest_xml.py module.""" |
16 | 16 | ||
17 | import os | 17 | import os |
18 | import platform | ||
18 | import shutil | 19 | import shutil |
19 | import tempfile | 20 | import tempfile |
20 | import unittest | 21 | import unittest |
@@ -377,6 +378,11 @@ class ProjectElementTests(ManifestParseTestCase): | |||
377 | self.assertCountEqual( | 378 | self.assertCountEqual( |
378 | result['extras'], | 379 | result['extras'], |
379 | ['g1', 'g2', 'g1', 'name:extras', 'all', 'path:path']) | 380 | ['g1', 'g2', 'g1', 'name:extras', 'all', 'path:path']) |
381 | groupstr = 'default,platform-' + platform.system().lower() | ||
382 | self.assertEqual(groupstr, manifest.GetGroupsStr()) | ||
383 | groupstr = 'g1,g2,g1' | ||
384 | manifest.manifestProject.config.SetString('manifest.groups', groupstr) | ||
385 | self.assertEqual(groupstr, manifest.GetGroupsStr()) | ||
380 | 386 | ||
381 | def test_set_revision_id(self): | 387 | def test_set_revision_id(self): |
382 | """Check setting of project's revisionId.""" | 388 | """Check setting of project's revisionId.""" |