From: wb0716 Date: Wed, 26 Jul 2023 11:33:27 +0000 (+0800) Subject: add assert for test cases X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=38e5c23cb4a843153925f9bdf61f37be09feda80;p=tools%2Fgbs.git add assert for test cases Change-Id: I96ed99d15b2f1bf6c2ff65cf4a701319f87053d8 Signed-off-by: wb0716 --- diff --git a/tests/test_changelog.py b/tests/test_changelog.py index 84ee665..38fdc9a 100644 --- a/tests/test_changelog.py +++ b/tests/test_changelog.py @@ -26,7 +26,7 @@ import imp import datetime import time -from nose.tools import eq_, ok_, assert_raises, raises +from nose.tools import ok_, assert_raises, raises from gbp.git.repository import GitRepository @@ -111,15 +111,15 @@ class TestChangelog(unittest.TestCase): # eq_(GBS(argv=["gbs", "changelog"]), None) ok_(not os.path.exists(self.changes)) - eq_(GBS(argv=["gbs", "changelog", "--since=HEAD~2"]), None) - eq_(open(self.changes).read(), + self.assertEqual(GBS(argv=["gbs", "changelog", "--since=HEAD~2"]), None) + self.assertEqual(open(self.changes).read(), "* %s %s <%s> %s\n- change 2\n- change 3\n\n" % \ (ENV["date"], ENV["name"], ENV["email"], ENV["commits"][0][:7])) def test_new_changes_with_content_pos1(self): """Test generating new .changes with specific content.""" - eq_(GBS(argv=["gbs", "changelog", "-m", "new .changes"]), None) - eq_(open(self.changes).read(), + self.assertEqual(GBS(argv=["gbs", "changelog", "-m", "new .changes"]), None) + self.assertEqual(open(self.changes).read(), "* %s %s <%s> %s\n- new .changes\n\n" % \ (ENV["date"], ENV["name"], ENV["email"], ENV["commits"][0][:7])) @@ -131,16 +131,16 @@ class TestChangelog(unittest.TestCase): with open(self.changes, "w") as changes: changes.write(init) - eq_(GBS(argv=["gbs", "changelog"]), None) + self.assertEqual(GBS(argv=["gbs", "changelog"]), None) expected = "* %s %s <%s> %s\n- change 2\n- change 3\n\n" % \ (ENV["date"], ENV["name"], ENV["email"], ENV["commits"][0][:7]) - eq_(open(self.changes).read(), expected+init) + self.assertEqual(open(self.changes).read(), expected+init) def test_since_pos1(self): """Test --since command line option.""" - eq_(GBS(argv=["gbs", "changelog", "--since", ENV["commits"][1]]), None) - eq_(open(self.changes).read(), + self.assertEqual(GBS(argv=["gbs", "changelog", "--since", ENV["commits"][1]]), None) + self.assertEqual(open(self.changes).read(), "* %s %s <%s> %s\n- change 3\n\n" % \ (ENV["date"], ENV["name"], ENV["email"], ENV["commits"][0][:7])) @@ -154,13 +154,14 @@ class TestChangelog(unittest.TestCase): @raises(GbsError) def test_no_new_changes_neg1(): """Test failure when no new changes can be generated.""" - eq_(GBS(argv=["gbs", "changelog"]), None) + self.assertEqual(GBS(argv=["gbs", "changelog"]), None) GBS(argv=["gbs", "changelog"]) @staticmethod @raises(GbsError) def test_wrong_since_neg1(): """Test failure with wrong --since value.""" + self.assertEqual(GBS(argv=["gbs", "changelog", "--since", "bla"]), None) GBS(argv=["gbs", "changelog", "--since", "bla"]) @raises(GbsError) @@ -169,6 +170,7 @@ class TestChangelog(unittest.TestCase): with open(self.changes, "w") as changes: changes.write("* Wed Aug 22 2012 test " "xxxxxx\n- change 3\n\n") + self.assertEqual(GBS(argv=["gbs", "changelog"]), None) GBS(argv=["gbs", "changelog"]) @staticmethod @@ -176,10 +178,12 @@ class TestChangelog(unittest.TestCase): def test_not_in_git_repository_neg1(): """Test failure when run not in git repo.""" os.chdir('..') + self.assertEqual(GBS(argv=["gbs", "changelog"]), None) GBS(argv=["gbs", "changelog"]) @raises(GbsError) def test_no_spec_neg1(self): """Test failure when there is not spec in packaging dir.""" os.unlink(self.spec) + self.assertEqual(GBS(argv=["gbs", "changelog"]), None) GBS(argv=["gbs", "changelog"]) diff --git a/tests/test_export.py b/tests/test_export.py index 833c586..28dbee4 100644 --- a/tests/test_export.py +++ b/tests/test_export.py @@ -5,7 +5,7 @@ import imp import os import shutil import tempfile -from nose.tools import raises, eq_ +from nose.tools import raises from gitbuildsys.cmd_export import config_is_true GBS = imp.load_source("gbs", "./tools/gbs").main @@ -29,7 +29,7 @@ class TestExport(unittest.TestCase): GBS(argv=["gbs", "export", "fake", "-o", "tmp_output"]) shutil.rmtree(os.path.join(self.testdataDir, "./tmp_output")) except SystemExit as err: - eq_(err.code, 0) + self.assertEqual(err.code, 0) def test_command_export_source_rpm_pos1(self): """Test running gbs export source rpm commond.""" @@ -37,7 +37,7 @@ class TestExport(unittest.TestCase): GBS(argv=["gbs", "export", "fake", "--source-rpm", "-o", "tmp_output"]) shutil.rmtree(os.path.join(self.testdataDir, "./tmp_output")) except SystemExit as err: - eq_(err.code, 0) + self.assertEqual(err.code, 0) def test_command_export_include_all_pos1(self): """Test running gbs export with include-all commond.""" @@ -45,7 +45,7 @@ class TestExport(unittest.TestCase): GBS(argv=["gbs", "export", "fake", "--include-all", "-o", "tmp_output"]) shutil.rmtree(os.path.join(self.testdataDir, "./tmp_output")) except SystemExit as err: - eq_(err.code, 0) + self.assertEqual(err.code, 0) def test_command_export_outdir_directly_pos1(self): """Test running gbs export with include-all commond.""" @@ -53,7 +53,7 @@ class TestExport(unittest.TestCase): GBS(argv=["gbs", "export", "fake", "--outdir-directly", "-o", "tmp_output"]) shutil.rmtree(os.path.join(self.testdataDir, "./tmp_output")) except SystemExit as err: - eq_(err.code, 0) + self.assertEqual(err.code, 0) def test_command_export_special_spec_pos1(self): """Test running gbs export with --spec and --no-patch-export commond.""" @@ -61,7 +61,7 @@ class TestExport(unittest.TestCase): GBS(argv=["gbs", "export", "fake", "--spec=fake.spec", "--no-patch-export", "-o", "tmp_output"]) shutil.rmtree(os.path.join(self.testdataDir, "./tmp_output")) except SystemExit as err: - eq_(err.code, 0) + self.assertEqual(err.code, 0) def test_config_is_true_pos1(self): @@ -70,7 +70,7 @@ class TestExport(unittest.TestCase): config_is_true('yes') config_is_true(True) except SystemExit as err: - eq_(err.code, 0) + self.assertEqual(err.code, 0) def test_command_export_disable_fallback_to_native_packaging_pos1(self): """Test running gbs export failed case:disable fallback to native commond.""" @@ -85,7 +85,7 @@ class TestExport(unittest.TestCase): GBS(argv=["gbs", "export", "sw-tools"]) shutil.rmtree('/tmp/gbs_export_tmp') except SystemExit as err: - eq_(err.code, 2) + self.assertEqual(err.code, 2) @raises(Exception) def test_command_export_special_spec_pos1(self): @@ -94,4 +94,4 @@ class TestExport(unittest.TestCase): os.chdir('/home/build/acl') GBS(argv=["gbs", "export", "--include-all", "-o", "/tmp"]) except SystemExit as err: - eq_(err.code, 0) + self.assertEqual(err.code, 0) diff --git a/tests/test_help.py b/tests/test_help.py index 5fc7754..ea92f9e 100644 --- a/tests/test_help.py +++ b/tests/test_help.py @@ -21,7 +21,6 @@ import unittest import imp -from nose.tools import eq_ GBS = imp.load_source("gbs", "./tools/gbs").main @@ -39,7 +38,7 @@ class TestHelp(unittest.TestCase): print('>>>sub', sub) GBS(argv=["gbs", sub, "--help"]) except SystemExit as err: - eq_(err.code, 0) + self.assertEqual(err.code, 0) @staticmethod def test_help_pos1(): @@ -47,4 +46,4 @@ class TestHelp(unittest.TestCase): try: GBS(argv=["gbs", "--help"]) except SystemExit as err: - eq_(err.code, 0) + self.assertEqual(err.code, 0) diff --git a/tests/test_import.py b/tests/test_import.py index eadad2c..10dd72d 100644 --- a/tests/test_import.py +++ b/tests/test_import.py @@ -26,7 +26,7 @@ import imp from functools import wraps -from nose.tools import eq_, raises +from nose.tools import raises from gitbuildsys.errors import GbsError @@ -82,21 +82,21 @@ class TestImport(unittest.TestCase): @with_data("ail-0.2.29-2.3.src.rpm") def test_import_srcrpm_pos1(self, srcrpm): """Test importing from source rpm.""" - eq_(GBS(argv=["gbs", "import", srcrpm]), None) + self.assertEqual(GBS(argv=["gbs", "import", srcrpm]), None) repo = GitRepository("./ail") - eq_(repo.get_local_branches(), ['master', 'pristine-tar', 'upstream']) - eq_(repo.get_tags(), ['upstream/0.2.29', 'vendor/0.2.29-2.3']) + self.assertEqual(repo.get_local_branches(), ['master', 'pristine-tar', 'upstream']) + self.assertEqual(repo.get_tags(), ['upstream/0.2.29', 'vendor/0.2.29-2.3']) @with_data("bluez_unpacked") def test_import_spec_pos1(self, srcdir): """Test importing from spec.""" - eq_(GBS(argv=["gbs", "import", + self.assertEqual(GBS(argv=["gbs", "import", os.path.join(srcdir, 'bluez.spec')]), None) repo = GitRepository("./bluez") - eq_(repo.get_local_branches(), ['master', 'pristine-tar', 'upstream']) + self.assertEqual(repo.get_local_branches(), ['master', 'pristine-tar', 'upstream']) # No packging tag as patch-import fails - eq_(repo.get_tags(), ['upstream/4.87']) - eq_(len(repo.get_commits(until='master')), 2) + self.assertEqual(repo.get_tags(), ['upstream/4.87']) + self.assertEqual(len(repo.get_commits(until='master')), 2) #raise Exception(os.listdir('./bluez')) @@ -106,30 +106,30 @@ class TestImport(unittest.TestCase): # Create empty git repo repo = GitRepository.create("./repo_dir") os.chdir(repo.path) - eq_(GBS(argv=["gbs", "import", srcrpm]), None) - eq_(repo.get_local_branches(), ['master', 'pristine-tar', 'upstream']) - eq_(repo.get_tags(), ['upstream/0.2.29','vendor/0.2.29-2.5']) + self.assertEqual(GBS(argv=["gbs", "import", srcrpm]), None) + self.assertEqual(repo.get_local_branches(), ['master', 'pristine-tar', 'upstream']) + self.assertEqual(repo.get_tags(), ['upstream/0.2.29','vendor/0.2.29-2.5']) #raise Exception(os.listdir('./bluez')) @with_data("app-core-1.2-19.3.src.rpm") def test_set_author_name_email_pos1(self, srcrpm): """Test --author-name and --author-email command line options.""" - eq_(GBS(argv=["gbs", "import", "--author-name=test", + self.assertEqual(GBS(argv=["gbs", "import", "--author-name=test", "--author-email=test@otctools.jf.intel.com", srcrpm]), None) repo = GitRepository("./app-core") - eq_(repo.get_local_branches(), ['master', 'pristine-tar', 'upstream']) - eq_(repo.get_tags(), ['upstream/1.2', 'vendor/1.2-19.3']) + self.assertEqual(repo.get_local_branches(), ['master', 'pristine-tar', 'upstream']) + self.assertEqual(repo.get_tags(), ['upstream/1.2', 'vendor/1.2-19.3']) @with_data("ail-0.2.29-2.3.src.rpm") def test_specify_upstream_pos1(self, srcrpm): """Test --upstream command line option.""" - eq_(GBS(argv=["gbs", "import", "--upstream-branch=upstream", + self.assertEqual(GBS(argv=["gbs", "import", "--upstream-branch=upstream", srcrpm]), None) repo = GitRepository("./ail") - eq_(repo.get_local_branches(), ['master', 'pristine-tar', 'upstream']) - eq_(repo.get_tags(), ['upstream/0.2.29','vendor/0.2.29-2.3']) + self.assertEqual(repo.get_local_branches(), ['master', 'pristine-tar', 'upstream']) + self.assertEqual(repo.get_tags(), ['upstream/0.2.29','vendor/0.2.29-2.3']) @raises(GbsError) @with_data("bison-1.27.tar.gz") diff --git a/tests/test_utils.py b/tests/test_utils.py index 6478548..3be4c83 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -71,7 +71,7 @@ class UtilsTest(unittest.TestCase): os.system('cp ./tests/testdata/fake.spec editfile') edit_file('editfile') except SystemExit as err: - eq_(err.code, 0) + self.assertEqual(err.code, 0) def test_GitRefMappingParser_pos1(self): '''test class GitRefMappingParser'''