Chris McDonough
2011-08-24 b5a3b0de22d6e94185226cbb56c98e3eaa359a31
refs
author Chris McDonough <chrism@plope.com>
Wednesday, August 24, 2011 04:45 +0200
committer Chris McDonough <chrism@plope.com>
Wednesday, August 24, 2011 04:45 +0200
commitb5a3b0de22d6e94185226cbb56c98e3eaa359a31
tree 919e5c8f815ff3816adf2e3c05584a0b9ab1368b tree | zip | gz
parent 9fa4d046debe891ccdef7e96d102a34c0b209594 view | diff
add some integration tests for aconflict autoresolution
2 files added
1 files modified
96 ■■■■■ changed files
pyramid/tests/conflictapp/__init__.py 23 ●●●●● diff | view | raw | blame | history
pyramid/tests/conflictapp/included.py 8 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_integration.py 65 ●●●●● diff | view | raw | blame | history