GitHub pull request #59 of commit 21e946108508ac0a72867aacebd04dd0f65b0eaa, has merge conflicts.
Running as SYSTEM
Setting status of 21e946108508ac0a72867aacebd04dd0f65b0eaa to PENDING with url https://acdl.mit.edu/csi/job/CE_robust_PR/94/ and message: 'Running tests... hold your breath...'
Using context: robust unit tests
[EnvInject] - Loading node environment variables.
Building remotely on reynolds in workspace /jenkins/workspace/CE_robust_PR
No credentials specified
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository https://github.com/convexengineering/robust
 > git init /jenkins/workspace/CE_robust_PR # timeout=10
Fetching upstream changes from https://github.com/convexengineering/robust
 > git --version # timeout=10
 > git fetch --tags --progress https://github.com/convexengineering/robust +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/robust # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/robust # timeout=10
Fetching upstream changes from https://github.com/convexengineering/robust
 > git fetch --tags --progress https://github.com/convexengineering/robust +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master # timeout=10
 > git rev-parse 21e946108508ac0a72867aacebd04dd0f65b0eaa^{commit} # timeout=10
Merging Revision 21e946108508ac0a72867aacebd04dd0f65b0eaa (detached) to origin/master, UserMergeOptions{mergeRemote='origin', mergeTarget='master', mergeStrategy='DEFAULT', fastForwardMode='FF'}
 > git rev-parse origin/master^{commit} # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f origin/master # timeout=3
 > git remote # timeout=10
 > git config --get remote.origin.url # timeout=10
 > git merge --ff 21e946108508ac0a72867aacebd04dd0f65b0eaa # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 21e946108508ac0a72867aacebd04dd0f65b0eaa # timeout=3
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff 21e946108508ac0a72867aacebd04dd0f65b0eaa" returned status code 1:
stdout: Auto-merging robust/testing/t_simulation.py
CONFLICT (content): Merge conflict in robust/testing/t_simulation.py
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Retrying after 10 seconds
No credentials specified
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository https://github.com/convexengineering/robust
 > git init /jenkins/workspace/CE_robust_PR # timeout=10
Fetching upstream changes from https://github.com/convexengineering/robust
 > git --version # timeout=10
 > git fetch --tags --progress https://github.com/convexengineering/robust +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/robust # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/robust # timeout=10
Fetching upstream changes from https://github.com/convexengineering/robust
 > git fetch --tags --progress https://github.com/convexengineering/robust +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master # timeout=10
 > git rev-parse 21e946108508ac0a72867aacebd04dd0f65b0eaa^{commit} # timeout=10
Merging Revision 21e946108508ac0a72867aacebd04dd0f65b0eaa (detached) to origin/master, UserMergeOptions{mergeRemote='origin', mergeTarget='master', mergeStrategy='DEFAULT', fastForwardMode='FF'}
 > git rev-parse origin/master^{commit} # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f origin/master # timeout=3
 > git remote # timeout=10
 > git config --get remote.origin.url # timeout=10
 > git merge --ff 21e946108508ac0a72867aacebd04dd0f65b0eaa # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 21e946108508ac0a72867aacebd04dd0f65b0eaa # timeout=3
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff 21e946108508ac0a72867aacebd04dd0f65b0eaa" returned status code 1:
stdout: Auto-merging robust/testing/t_simulation.py
CONFLICT (content): Merge conflict in robust/testing/t_simulation.py
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Retrying after 10 seconds
No credentials specified
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository https://github.com/convexengineering/robust
 > git init /jenkins/workspace/CE_robust_PR # timeout=10
Fetching upstream changes from https://github.com/convexengineering/robust
 > git --version # timeout=10
 > git fetch --tags --progress https://github.com/convexengineering/robust +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/robust # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/robust # timeout=10
Fetching upstream changes from https://github.com/convexengineering/robust
 > git fetch --tags --progress https://github.com/convexengineering/robust +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master # timeout=10
 > git rev-parse 21e946108508ac0a72867aacebd04dd0f65b0eaa^{commit} # timeout=10
Merging Revision 21e946108508ac0a72867aacebd04dd0f65b0eaa (detached) to origin/master, UserMergeOptions{mergeRemote='origin', mergeTarget='master', mergeStrategy='DEFAULT', fastForwardMode='FF'}
 > git rev-parse origin/master^{commit} # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f origin/master # timeout=3
 > git remote # timeout=10
 > git config --get remote.origin.url # timeout=10
 > git merge --ff 21e946108508ac0a72867aacebd04dd0f65b0eaa # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 21e946108508ac0a72867aacebd04dd0f65b0eaa # timeout=3
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff 21e946108508ac0a72867aacebd04dd0f65b0eaa" returned status code 1:
stdout: Auto-merging robust/testing/t_simulation.py
CONFLICT (content): Merge conflict in robust/testing/t_simulation.py
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Retrying after 10 seconds
No credentials specified
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository https://github.com/convexengineering/robust
 > git init /jenkins/workspace/CE_robust_PR # timeout=10
Fetching upstream changes from https://github.com/convexengineering/robust
 > git --version # timeout=10
 > git fetch --tags --progress https://github.com/convexengineering/robust +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/robust # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/robust # timeout=10
Fetching upstream changes from https://github.com/convexengineering/robust
 > git fetch --tags --progress https://github.com/convexengineering/robust +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master # timeout=10
 > git rev-parse 21e946108508ac0a72867aacebd04dd0f65b0eaa^{commit} # timeout=10
Merging Revision 21e946108508ac0a72867aacebd04dd0f65b0eaa (detached) to origin/master, UserMergeOptions{mergeRemote='origin', mergeTarget='master', mergeStrategy='DEFAULT', fastForwardMode='FF'}
 > git rev-parse origin/master^{commit} # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f origin/master # timeout=3
 > git remote # timeout=10
 > git config --get remote.origin.url # timeout=10
 > git merge --ff 21e946108508ac0a72867aacebd04dd0f65b0eaa # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 21e946108508ac0a72867aacebd04dd0f65b0eaa # timeout=3
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff 21e946108508ac0a72867aacebd04dd0f65b0eaa" returned status code 1:
stdout: Auto-merging robust/testing/t_simulation.py
CONFLICT (content): Merge conflict in robust/testing/t_simulation.py
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Setting status of 21e946108508ac0a72867aacebd04dd0f65b0eaa to FAILURE with url https://acdl.mit.edu/csi/job/CE_robust_PR/94/ and message: 'Shucks... didn't pass the tests...
 '
Using context: robust unit tests
Finished: FAILURE