diff --git a/integration/conftest.py b/integration/conftest.py index 5395d7c5f..48be2f26d 100644 --- a/integration/conftest.py +++ b/integration/conftest.py @@ -377,13 +377,31 @@ def chutney(reactor, temp_dir): proto, 'git', ( - 'git', 'clone', '--depth=1', + 'git', 'clone', 'https://git.torproject.org/chutney.git', chutney_dir, ), env=environ, ) pytest_twisted.blockon(proto.done) + + # XXX: Here we reset Chutney to the last revision known to work + # with Python 2, as a workaround for Chunteny moving to Python 3. + # When this is no longer necessary, we will have to drop this and + # add '--depth=1' back to the above 'git clone' subprocess. + proto = _DumpOutputProtocol(None) + reactor.spawnProcess( + proto, + 'git', + ( + 'git', '-C', chutney_dir, + 'reset', '--hard', + '99bd06c7554b9113af8c0877b6eca4ceb95dcbaa' + ), + env=environ, + ) + pytest_twisted.blockon(proto.done) + return chutney_dir diff --git a/newsfragments/3348.bugfix b/newsfragments/3348.bugfix new file mode 100644 index 000000000..e0f1f6c5e --- /dev/null +++ b/newsfragments/3348.bugfix @@ -0,0 +1 @@ +Use last known revision of Chutney that is known to work with Python 2 for Tor integration tests.