• Julien Muchembled's avatar
    Move mock.py to neo/tests to not conflict with https://pypi.python.org/pypi/mock · 80e5aa5c
    Julien Muchembled authored
    This is a backport commit for a project branch.
    Not sure of this cherry-pick conflict resolution, neoppod is not used in
    this project anyway, what matters is to fix the conflict when importing
    mock
    
     Conflicts:
    	.gitignore
    	neo/tests/client/testClientApp.py
    	neo/tests/client/testConnectionPool.py
    	neo/tests/storage/testClientHandler.py
    	neo/tests/storage/testStorageApp.py
    	neo/tests/storage/testStorageMySQL.py
    	neo/tests/storage/testTransactions.py
    	neo/tests/testNodes.py
    	setup.py
    80e5aa5c
testMasterHandler.py 6.88 KB