git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e0dd81b dfe90e8)
Merge branch 'ls/p4-test-timeouts'
authorJeff King <redacted>
Tue, 1 Dec 2015 23:54:40 +0000 (18:54 -0500)
committerJeff King <redacted>
Tue, 1 Dec 2015 23:54:40 +0000 (18:54 -0500)
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


Trivial merge
git clone https://git.99rst.org/PROJECT