##// END OF EJS Templates
catapult: rename 'active' to 'activetrace'; this isn't storing a boolean state...
Kyle Lippincott -
r40524:a9e00c48 default
parent child Browse files
Show More
@@ -1378,7 +1378,7 b' class TTest(Test):'
1378 script.append(b'%s %d 0\n' % (salt, line))
1378 script.append(b'%s %d 0\n' % (salt, line))
1379 else:
1379 else:
1380 script.append(b'echo %s %d $?\n' % (salt, line))
1380 script.append(b'echo %s %d $?\n' % (salt, line))
1381 active = []
1381 activetrace = []
1382 session = str(uuid.uuid4())
1382 session = str(uuid.uuid4())
1383 if PYTHON3:
1383 if PYTHON3:
1384 session = session.encode('ascii')
1384 session = session.encode('ascii')
@@ -1387,10 +1387,10 b' class TTest(Test):'
1387 if not hgcatapult or hgcatapult == os.devnull:
1387 if not hgcatapult or hgcatapult == os.devnull:
1388 return
1388 return
1389
1389
1390 if active:
1390 if activetrace:
1391 script.append(
1391 script.append(
1392 b'echo END %s %s >> "$HGCATAPULTSERVERPIPE"\n' % (
1392 b'echo END %s %s >> "$HGCATAPULTSERVERPIPE"\n' % (
1393 session, active[0]))
1393 session, activetrace[0]))
1394 if cmd is None:
1394 if cmd is None:
1395 return
1395 return
1396
1396
@@ -1402,7 +1402,7 b' class TTest(Test):'
1402 script.append(
1402 script.append(
1403 b'echo START %s %s >> "$HGCATAPULTSERVERPIPE"\n' % (
1403 b'echo START %s %s >> "$HGCATAPULTSERVERPIPE"\n' % (
1404 session, quoted))
1404 session, quoted))
1405 active[0:] = [quoted]
1405 activetrace[0:] = [quoted]
1406
1406
1407 script = []
1407 script = []
1408
1408
@@ -1543,7 +1543,7 b' class TTest(Test):'
1543 after.setdefault(pos, []).append(' !!! missing #endif\n')
1543 after.setdefault(pos, []).append(' !!! missing #endif\n')
1544 addsalt(n + 1, False)
1544 addsalt(n + 1, False)
1545 # Need to end any current per-command trace
1545 # Need to end any current per-command trace
1546 if active:
1546 if activetrace:
1547 toggletrace()
1547 toggletrace()
1548 return salt, script, after, expected
1548 return salt, script, after, expected
1549
1549
General Comments 0
You need to be logged in to leave comments. Login now