equal
deleted
inserted
replaced
1136 if r != '': # If line failed. |
1136 if r != '': # If line failed. |
1137 warnonly = 3 # for sure not |
1137 warnonly = 3 # for sure not |
1138 elif warnonly == 1: # Is "not yet" and line is warn only. |
1138 elif warnonly == 1: # Is "not yet" and line is warn only. |
1139 warnonly = 2 # Yes do warn. |
1139 warnonly = 2 # Yes do warn. |
1140 break |
1140 break |
1141 |
1141 else: |
1142 # clean up any optional leftovers |
1142 # clean up any optional leftovers |
1143 while expected.get(pos, None): |
1143 while expected.get(pos, None): |
1144 el = expected[pos].pop(0) |
1144 el = expected[pos].pop(0) |
1145 if not el.endswith(b" (?)\n"): |
1145 if el and not el.endswith(b" (?)\n"): |
1146 expected[pos].insert(0, el) |
1146 break |
1147 break |
1147 postout.append(b' ' + el) |
1148 postout.append(b' ' + el) |
|
1149 |
1148 |
1150 if lcmd: |
1149 if lcmd: |
1151 # Add on last return code. |
1150 # Add on last return code. |
1152 ret = int(lcmd.split()[1]) |
1151 ret = int(lcmd.split()[1]) |
1153 if ret != 0: |
1152 if ret != 0: |