# HG changeset patch # User Boris Feld # Date 2017-07-31 15:43:45 # Node ID 6c142f2796255a0530fe0a74eb31c4e0b1f81661 # Parent 806351695c6a27a1a35600c637299aad3d9b6b52 pypy: fix failing test files with Pypy5.6.0 Pypy 5.6.0 saves cached bytecode files in __pycache__ directory, clean them in tests to fix loading old test extensions code. Doing so should also helps for Python3.x migration. diff --git a/tests/test-commandserver.t b/tests/test-commandserver.t --- a/tests/test-commandserver.t +++ b/tests/test-commandserver.t @@ -234,7 +234,9 @@ check that local configs for the cached *** runcommand --config hooks.pre-identify=python:hook.hook id eff892de26ec tip +Clean hook cached version $ rm hook.py* + $ rm -Rf __pycache__ $ echo a >> a >>> import os diff --git a/tests/test-fncache.t b/tests/test-fncache.t --- a/tests/test-fncache.t +++ b/tests/test-fncache.t @@ -270,7 +270,11 @@ Aborting transaction prevents fncache ch > cmdtable = {} > > EOF + +Clean cached version $ rm -f "${extpath}c" + $ rm -Rf "`dirname $extpath`/__pycache__" + $ touch z $ hg ci -qAm z transaction abort! @@ -305,7 +309,11 @@ Aborted transactions can be recovered la > cmdtable = {} > > EOF + +Clean cached versions $ rm -f "${extpath}c" + $ rm -Rf "`dirname $extpath`/__pycache__" + $ hg up -q 1 $ touch z $ hg ci -qAm z 2>/dev/null