| commit | fa7095e63d0a9ace33114ebb2736084230e69b7a | |
| author | Jeff King <peff@peff.net> | |
| Tue, 1 Dec 2015 23:54:40 +0000 (1 18:54 -0500) | ||
| committer | Jeff King <peff@peff.net> | |
| Tue, 1 Dec 2015 23:54:40 +0000 (1 18:54 -0500) | ||
| tree | 934ce03a443524599a2c8d8f918a1b82d9d60519 | treesnapshot (tar.gz zip) |
| parent | e0dd81b08eef72f2554facaf6b494ea8d4a1f3d7 | commitdiff |
| parent | dfe90e8b528be4d9668b1bdc6329f8227cbf307a | commitdiff |
Merge branch 'ls/p4-test-timeouts'
Work around some test flakiness with p4d.
* ls/p4-test-timeouts:
git-p4: add trap to kill p4d on test exit
git-p4: add p4d timeout in tests
git-p4: retry kill/cleanup operations in tests with timeout
Work around some test flakiness with p4d.
* ls/p4-test-timeouts:
git-p4: add trap to kill p4d on test exit
git-p4: add p4d timeout in tests
git-p4: retry kill/cleanup operations in tests with timeout