Skip to content

Commit 8dff3a4

Browse files
committed
case for ArgSpec style. update the unittests
test=document_fix
1 parent 3883ec1 commit 8dff3a4

File tree

2 files changed

+25
-17
lines changed

2 files changed

+25
-17
lines changed

tools/sampcd_processor.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,9 +610,13 @@ def get_api_md5(path):
610610
API_spec = '%s/%s' % (os.path.abspath(os.path.join(os.getcwd(), "..")),
611611
path)
612612
pat = re.compile(r'\((paddle[^,]+)\W*document\W*([0-9a-z]{32})')
613+
patArgSpec = re.compile(
614+
r'^(paddle[^,]+)\s+\(ArgSpec.*document\W*([0-9a-z]{32})')
613615
with open(API_spec) as f:
614616
for line in f.readlines():
615617
mo = pat.search(line)
618+
if not mo:
619+
mo = patArgSpec.search(line)
616620
if mo:
617621
api_md5[mo.group(1)] = mo.group(2)
618622
return api_md5

tools/test_sampcd_processor.py

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,10 @@ def setUp(self):
162162
os.path.join(os.getcwd(), "..", 'paddle/fluid/API_PR.spec'))
163163
with open(self.api_pr_spec_filename, 'w') as f:
164164
f.write("\n".join([
165-
"""one_plus_one (ArgSpec(args=[], varargs=None, keywords=None, defaults=(,)), ('document', 'md5sum of one_plus_one'))""",
166-
"""two_plus_two (ArgSpec(args=[], varargs=None, keywords=None, defaults=(,)), ('document', 'md5sum of two_plus_two'))""",
167-
"""three_plus_three (ArgSpec(args=[], varargs=None, keywords=None, defaults=(,)), ('document', 'md5sum of three_plus_three'))""",
168-
"""four_plus_four (ArgSpec(args=[], varargs=None, keywords=None, defaults=(,)), ('document', 'md5sum of four_plus_four'))""",
165+
"""paddle.one_plus_one (ArgSpec(args=[], varargs=None, keywords=None, defaults=(,)), ('document', 'ff0f188c95030158cc6398d2a6c55one'))""",
166+
"""paddle.two_plus_two (ArgSpec(args=[], varargs=None, keywords=None, defaults=(,)), ('document', 'ff0f188c95030158cc6398d2a6c55two'))""",
167+
"""paddle.three_plus_three (ArgSpec(args=[], varargs=None, keywords=None, defaults=(,)), ('document', 'ff0f188c95030158cc6398d2a6cthree'))""",
168+
"""paddle.four_plus_four (paddle.four_plus_four, ('document', 'ff0f188c95030158cc6398d2a6c5four'))""",
169169
]))
170170

171171
def tearDown(self):
@@ -174,11 +174,14 @@ def tearDown(self):
174174

175175
def test_get_api_md5(self):
176176
res = get_api_md5('paddle/fluid/API_PR.spec')
177-
self.assertEqual("'md5sum of one_plus_one'", res['one_plus_one'])
178-
self.assertEqual("'md5sum of two_plus_two'", res['two_plus_two'])
179-
self.assertEqual("'md5sum of three_plus_three'",
180-
res['three_plus_three'])
181-
self.assertEqual("'md5sum of four_plus_four'", res['four_plus_four'])
177+
self.assertEqual("ff0f188c95030158cc6398d2a6c55one",
178+
res['paddle.one_plus_one'])
179+
self.assertEqual("ff0f188c95030158cc6398d2a6c55two",
180+
res['paddle.two_plus_two'])
181+
self.assertEqual("ff0f188c95030158cc6398d2a6cthree",
182+
res['paddle.three_plus_three'])
183+
self.assertEqual("ff0f188c95030158cc6398d2a6c5four",
184+
res['paddle.four_plus_four'])
182185

183186

184187
class Test_get_incrementapi(unittest.TestCase):
@@ -187,16 +190,16 @@ def setUp(self):
187190
os.path.join(os.getcwd(), "..", 'paddle/fluid/API_PR.spec'))
188191
with open(self.api_pr_spec_filename, 'w') as f:
189192
f.write("\n".join([
190-
"""one_plus_one (ArgSpec(args=[], varargs=None, keywords=None, defaults=(,)), ('document', 'md5sum of one_plus_one'))""",
191-
"""two_plus_two (ArgSpec(args=[], varargs=None, keywords=None, defaults=(,)), ('document', 'md5sum of two_plus_two'))""",
192-
"""three_plus_three (ArgSpec(args=[], varargs=None, keywords=None, defaults=(,)), ('document', 'md5sum of three_plus_three'))""",
193-
"""four_plus_four (ArgSpec(args=[], varargs=None, keywords=None, defaults=(,)), ('document', 'md5sum of four_plus_four'))""",
193+
"""paddle.one_plus_one (ArgSpec(args=[], varargs=None, keywords=None, defaults=(,)), ('document', 'ff0f188c95030158cc6398d2a6c55one'))""",
194+
"""paddle.two_plus_two (ArgSpec(args=[], varargs=None, keywords=None, defaults=(,)), ('document', 'ff0f188c95030158cc6398d2a6c55two'))""",
195+
"""paddle.three_plus_three (ArgSpec(args=[], varargs=None, keywords=None, defaults=(,)), ('document', 'ff0f188c95030158cc6398d2a6cthree'))""",
196+
"""paddle.four_plus_four (paddle.four_plus_four, ('document', 'ff0f188c95030158cc6398d2a6c5four'))""",
194197
]))
195198
self.api_dev_spec_filename = os.path.abspath(
196199
os.path.join(os.getcwd(), "..", 'paddle/fluid/API_DEV.spec'))
197200
with open(self.api_dev_spec_filename, 'w') as f:
198201
f.write("\n".join([
199-
"""one_plus_one (ArgSpec(args=[], varargs=None, keywords=None, defaults=(,)), ('document', 'md5sum of one_plus_one'))""",
202+
"""paddle.one_plus_one (ArgSpec(args=[], varargs=None, keywords=None, defaults=(,)), ('document', 'ff0f188c95030158cc6398d2a6c55one'))""",
200203
]))
201204
self.api_diff_spec_filename = os.path.abspath(
202205
os.path.join(os.getcwd(), "dev_pr_diff_api.spec"))
@@ -210,9 +213,10 @@ def test_it(self):
210213
get_incrementapi()
211214
with open(self.api_diff_spec_filename, 'r') as f:
212215
lines = f.readlines()
213-
self.assertCountEqual(
214-
["two_plus_two\n", "three_plus_three\n", "four_plus_four\n"],
215-
lines)
216+
self.assertCountEqual([
217+
"paddle.two_plus_two\n", "paddle.three_plus_three\n",
218+
"paddle.four_plus_four\n"
219+
], lines)
216220

217221

218222
class Test_get_wlist(unittest.TestCase):

0 commit comments

Comments
 (0)