From: wb0716 Date: Fri, 22 Mar 2024 15:51:13 +0000 (+0800) Subject: fix case run error for python3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a74e0870c8a5f794339f81dc816a77882ae7181d;p=tools%2Fgbs.git fix case run error for python3 Change-Id: Ie1cb7708664669b558e72fe03cfbace599365de9 Signed-off-by: wangbiao --- diff --git a/gitbuildsys/conf.py b/gitbuildsys/conf.py index daf1961..c41965e 100644 --- a/gitbuildsys/conf.py +++ b/gitbuildsys/conf.py @@ -218,7 +218,7 @@ url = https://api.tizen.org #Repo section example [repo.tizen_latest] #Build against repo's URL -url = http://download.tizen.org/releases/milestone/tizen/unified/latest/repos/standard/packages// +url = http://download.tizen.org/releases/milestone/TIZEN/Tizen/Tizen-Unified/latest/repos/standard/packages/ #Optional user and password, set if differ from profile's user and password #user = #passwd = diff --git a/gitbuildsys/utils.py b/gitbuildsys/utils.py index b7b30b1..91ad2b3 100644 --- a/gitbuildsys/utils.py +++ b/gitbuildsys/utils.py @@ -624,7 +624,7 @@ class GerritNameMapper(object): lst_node = root.iter("package") for node in lst_node: if "name" in node.attrib: - for child in node.getchildren(): + for child in list(node): if child.tag == 'source': self._pkg2src[node.attrib['name']] = child.text self._src2pkg[child.text] = node.attrib['name'] diff --git a/tests/test_changelog.py b/tests/test_changelog.py index 0154540..12a684c 100644 --- a/tests/test_changelog.py +++ b/tests/test_changelog.py @@ -144,22 +144,19 @@ class TestChangelog(unittest.TestCase): "* %s %s <%s> %s\n- change 3\n\n" % \ (ENV["date"], ENV["name"], ENV["email"], ENV["commits"][0][:7])) - @staticmethod - def test_not_updated_pos1(): + def test_not_updated_pos1(self): """Test normal exit when changelog is not updated.""" set_editor("true") self.assertEqual(GBS(argv=["gbs ", "changelog", "-m", "new entry"]), None) - @staticmethod @raises(GbsError) - def test_no_new_changes_neg1(): + def test_no_new_changes_neg1(self): """Test failure when no new changes can be generated.""" self.assertEqual(GBS(argv=["gbs", "changelog"]), None) GBS(argv=["gbs", "changelog"]) - @staticmethod @raises(GbsError) - def test_wrong_since_neg1(): + def test_wrong_since_neg1(self): """Test failure with wrong --since value.""" self.assertEqual(GBS(argv=["gbs", "changelog", "--since", "bla"]), None) GBS(argv=["gbs", "changelog", "--since", "bla"]) @@ -173,9 +170,8 @@ class TestChangelog(unittest.TestCase): self.assertEqual(GBS(argv=["gbs", "changelog"]), None) GBS(argv=["gbs", "changelog"]) - @staticmethod @raises(GbsError) - def test_not_in_git_repository_neg1(): + def test_not_in_git_repository_neg1(self): """Test failure when run not in git repo.""" os.chdir('..') self.assertEqual(GBS(argv=["gbs", "changelog"]), None) diff --git a/tests/test_help.py b/tests/test_help.py index f0b0711..0a2e8eb 100644 --- a/tests/test_help.py +++ b/tests/test_help.py @@ -26,8 +26,7 @@ GBS = SourceFileLoader("gbs", "./tools/gbs").load_module("gbs").main class TestHelp(unittest.TestCase): """Test help output of gbs commands""" - @staticmethod - def test_subcommand_help_pos1(): + def test_subcommand_help_pos1(self): """Test running gbs help with all possible subcommands.""" for sub in ["build", "lb", "remotebuild", "rb", "changelog", "ch", "submit", "sr", "export", "ex", "import", "im", @@ -39,8 +38,7 @@ class TestHelp(unittest.TestCase): except SystemExit as err: self.assertEqual(err.code, 0) - @staticmethod - def test_help_pos1(): + def test_help_pos1(self): """Test running gbs --help and gbs help.""" try: GBS(argv=["gbs", "--help"]) diff --git a/tests/test_import.py b/tests/test_import.py index 64671a8..e2c88f6 100644 --- a/tests/test_import.py +++ b/tests/test_import.py @@ -158,21 +158,19 @@ class TestImport(unittest.TestCase): except SystemExit as err: self.assertEqual(err.code, 0) - @raises(SystemExit) def test_missing_argument_neg1(self): - """Test raising exception when running gbs without any arguments.""" + """Test exit by sys.exit(2) by argparse module when running gbs without any arguments.""" try: GBS(argv=["gbs", "import"]) except SystemExit as err: - self.assertEqual(err.code, 0) + self.assertNotEqual(err.code, 0) - @raises(SystemExit) def test_too_many_arguments_neg1(self): - """Test raising exception when running gbs with too many arguments.""" + """Test exit by sys.exit(2) by argparse module when running gbs with too many arguments.""" try: GBS(argv=["gbs", "import", "1", "2"]) except SystemExit as err: - self.assertEqual(err.code, 0) + self.assertNotEqual(err.code, 0) @raises(GbsError) def test_path_doesnt_exist_neg1(self): diff --git a/tests/test_utils.py b/tests/test_utils.py index 3be4c83..fb46de4 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -27,6 +27,7 @@ import os import gitbuildsys.conf from gitbuildsys.conf import configmgr import requests +from imp import reload class UtilsTest(unittest.TestCase): '''Test SafeURL class''' @@ -45,6 +46,7 @@ class UtilsTest(unittest.TestCase): directory=True) cachedir = cache.path repos = [i.url for i in profile.repos] + print("repos: %s" % repos) repoparser = RepoParser(repos, cachedir) repourls = repoparser.get_repos_by_arch('armv7l') self.assertTrue(repourls) @@ -83,13 +85,13 @@ class UtilsTest(unittest.TestCase): '''test calss GerritNameMapper''' profile = configmgr.get_current_profile() - profile_pkgs_url = 'http://download.tizen.org/releases/milestone/tizen/unified/latest/builddata/depends/Tizen:Unified_standard_armv7l_revpkgdepends.xml' - r = requests.get('http://download.tizen.org/releases/milestone/tizen/unified/latest/builddata/depends/Tizen:Unified_standard_armv7l_revpkgdepends.xml') + profile_pkgs_url = 'http://download.tizen.org/archive/releases/milestone/tizen/4.0-unified/latest/builddata/depends/Tizen:4.0:Unified_standard_i586_revpkgdepends.xml' + r = requests.get('http://download.tizen.org/archive/releases/milestone/tizen/4.0-unified/latest/builddata/depends/Tizen:4.0:Unified_standard_i586_revpkgdepends.xml') USERID = 'test' TMPDIR = os.path.join(configmgr.get('tmpdir', 'general'), '%s-gbs' % USERID) cache = Temp(prefix=os.path.join(TMPDIR, 'gbscache'), directory=True) cachedir = cache.path - profile_repo = 'http://download.tizen.org/releases/milestone/tizen/unified/latest/repos/standard/packages/' + profile_repo = 'http://download.tizen.org/archive/releases/milestone/tizen/4.0-unified/latest/repos/standard/packages/' repoparser = RepoParser([SafeURL(profile_repo)], cachedir) diff --git a/tests/testdata/base.cfg b/tests/testdata/base.cfg index f8dab07..cdb4ae3 100644 --- a/tests/testdata/base.cfg +++ b/tests/testdata/base.cfg @@ -25,21 +25,21 @@ passwdx = QlpoOTFBWSZTWWV18UwAAAKDgAAAkiCZgCAAMQZMQQDJ6jQwAvxdyRThQkGV18Uw [repo.tizen_main] #url = http://download.tizen.org/releases/2.2/latest/repos/tizen-main/ia32/packages/ -url = http://download.tizen.org/releases/milestone/tizen/unified/latest/repos/standard/packages/ +url = http://download.tizen.org/releases/milestone/TIZEN/Tizen/Tizen-Unified/latest/repos/standard/packages/ [profile.tizen_base] repos = repo.tizen_base [repo.tizen_base] #url = http://download.tizen.org/releases/2.2/latest/repos/tizen-base/ia32/packages/ -url = http://download.tizen.org/releases/milestone/tizen/base/latest/repos/standard/packages/ +url = http://download.tizen.org/releases/milestone/TIZEN/Tizen/Tizen-Base/latest/repos/standard/packages/ [profile.tizen_ivi] repos = repo.tizen_ivi [repo.tizen_ivi] #url = http://download.tizen.org/releases/daily/tizen/ivi/latest/repos/atom/packages/ -url = http://download.tizen.org/releases/milestone/tizen/ivi/latest/repos/atom/packages/ +url = http://download.tizen.org/archive/releases/milestone/tizen/ivi/latest/repos/atom/packages/ [profile.tizen_negative1] repos = repo.tizen_negative1