comparison tests/run-tests.py @ 31673:6a2959acae1a

runtests: change local IP glob pattern from "127.0.0.1" to "$LOCALIP" This is similar to what 348b2b9da703 does. Since 636cf3f7620d has changed "127.0.0.1" to "$LOCALIP". The glob pattern needs update accordingly. It is expected to fix tests running in some BSD jails.
author Jun Wu <quark@fb.com>
date Sun, 26 Mar 2017 19:57:17 -0700
parents 632e07e72a22
children 728d37353e1e
comparison
equal deleted inserted replaced
31672:e6fd7930cf0b 31673:6a2959acae1a
1032 re.compile(br'^pushing to \$TESTTMP/.*[^)]$'), 1032 re.compile(br'^pushing to \$TESTTMP/.*[^)]$'),
1033 re.compile(br'^moving \S+/.*[^)]$'), 1033 re.compile(br'^moving \S+/.*[^)]$'),
1034 re.compile(br'^pulling from \$TESTTMP/.*[^)]$'), 1034 re.compile(br'^pulling from \$TESTTMP/.*[^)]$'),
1035 # Not all platforms have 127.0.0.1 as loopback (though most do), 1035 # Not all platforms have 127.0.0.1 as loopback (though most do),
1036 # so we always glob that too. 1036 # so we always glob that too.
1037 re.compile(br'.*127.0.0.1.*$'), 1037 re.compile(br'.*\$LOCALIP.*$'),
1038 ] 1038 ]
1039 1039
1040 bchr = chr 1040 bchr = chr
1041 if PYTHON3: 1041 if PYTHON3:
1042 bchr = lambda x: bytes([x]) 1042 bchr = lambda x: bytes([x])
1340 for pat in checkcodeglobpats: 1340 for pat in checkcodeglobpats:
1341 if pat.match(el): 1341 if pat.match(el):
1342 return True 1342 return True
1343 return b'-glob' 1343 return b'-glob'
1344 return True 1344 return True
1345 el = el.replace(b'127.0.0.1', b'*') 1345 el = el.replace(b'$LOCALIP', b'*')
1346 i, n = 0, len(el) 1346 i, n = 0, len(el)
1347 res = b'' 1347 res = b''
1348 while i < n: 1348 while i < n:
1349 c = el[i:i + 1] 1349 c = el[i:i + 1]
1350 i += 1 1350 i += 1