From 019e20195c75fa87f994b46c8bfb1f11b5738707 Mon Sep 17 00:00:00 2001 From: zhouwei25 <52485244+zhouwei25@users.noreply.github.com> Date: Wed, 8 Jan 2020 22:20:15 +0800 Subject: [PATCH] fix diff_unittest.py of ci rule to avoid Misjudgment (#22113) --- tools/diff_unittest.py | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/tools/diff_unittest.py b/tools/diff_unittest.py index 1e069484bc9..8b5e7a638d6 100644 --- a/tools/diff_unittest.py +++ b/tools/diff_unittest.py @@ -2,23 +2,30 @@ import difflib import sys -with open(sys.argv[1], 'r') as f: - origin = f.read() +try: + f1 = open(sys.argv[1], 'r') + origin = f1.read() origin = origin.splitlines() +except: + sys.exit(0) +else: + f1.close() -with open(sys.argv[2], 'r') as f: - new = f.read() +try: + f2 = open(sys.argv[2], 'r') + new = f2.read() new = new.splitlines() - -differ = difflib.Differ() -result = differ.compare(origin, new) +except: + sys.exit(0) +else: + f2.close() error = False diffs = [] -for each_diff in result: - if each_diff[0] == '-': # delete unit test is not allowed +for i in origin: + if i not in new: error = True - diffs.append(each_diff) + diffs.append(i) ''' If you delete the unit test, such as commenting it out, please ask for approval of one RD below for passing CI: @@ -27,4 +34,4 @@ please ask for approval of one RD below for passing CI: ''' if error: for each_diff in diffs: - print(each_diff) + print("- %s" % each_diff) -- GitLab