| branch | stable |
| changeset 1135 | 7c026ccf4e1a |
| parent 1131 | 1938c2ebf517 |
| child 1138 | bb419c4bfdd9 |
| 1133:82f74372516e | 1135:7c026ccf4e1a |
|---|---|
682 # Merge the script output back into a unified test |
682 # Merge the script output back into a unified test |
683 |
683 |
684 pos = -1 |
684 pos = -1 |
685 postout = [] |
685 postout = [] |
686 ret = 0 |
686 ret = 0 |
687 for n, l in enumerate(output): |
687 for l in output: |
688 lout, lcmd = l, None |
688 lout, lcmd = l, None |
689 if salt in l: |
689 if salt in l: |
690 lout, lcmd = l.split(salt, 1) |
690 lout, lcmd = l.split(salt, 1) |
691 |
691 |
692 if lout: |
692 if lout: |