fix: more test imports and paths

Author: heikoheiko

ethereum/tests/test_bloom.py

@@ -2,6 +2,7 @@
 import json
 import ethereum.processblock as pb
 import ethereum.utils as utils
+import ethereum.testutils as testutils
 import ethereum.bloom as bloom
 import os
 from rlp.utils import decode_hex, encode_hex, str_to_bytes
@@ -20,8 +21,8 @@ def vm_tests_fixtures():
     """
     # FIXME: assert that repo is uptodate
     # cd fixtures; git pull origin develop; cd ..;  git commit fixtures
-    filenames = os.listdir(os.path.join('fixtures', 'VMTests'))
-    files = [os.path.join('fixtures', 'VMTests', f) for f in filenames]
+    filenames = os.listdir(os.path.join(testutils.fixture_path, 'VMTests'))
+    files = [os.path.join(testutils.fixture_path, 'VMTests', f) for f in filenames]
     vm_fixtures = {}
     try:
         for f, fn in zip(files, filenames):

ethereum/tests/test_genesis.py

@@ -1,8 +1,10 @@
+import os
 import pytest
 import json
 import ethereum.blocks as blocks
+import ethereum.testutils as testutils
 from rlp.utils import encode_hex
-from tests.utils import new_db
+from ethereum.tests.utils import new_db
 from ethereum.slogging import get_logger, configure_logging
 logger = get_logger()
 configure_logging(':trace')
@@ -14,7 +16,8 @@ def genesis_fixture():
     Read genesis block from fixtures.
     """
     genesis_fixture = None
-    with open('fixtures/BasicTests/genesishashestest.json', 'r') as f:
+    fn = os.path.join(testutils.fixture_path, 'BasicTests', 'genesishashestest.json')
+    with open(fn, 'r') as f:
         genesis_fixture = json.load(f)
     assert genesis_fixture is not None, "Could not read genesishashtest.json from fixtures. Make sure you did 'git submodule init'!"
     # FIXME: assert that link is uptodate

ethereum/tests/test_trie_next_prev.py

@@ -1,6 +1,8 @@
+import os
 import json
 import ethereum.trie as trie
-from tests.utils import new_db
+from ethereum.tests.utils import new_db
+import ethereum.testutils as testutils
 from ethereum.slogging import get_logger, configure_logging
 logger = get_logger()
 
@@ -16,7 +18,9 @@ def check_testdata(data_keys, expected_keys):
 
 def load_tests():
     try:
-        fixture = json.load(open('fixtures/TrieTests/trietestnextprev.json', 'r'))
+        fn = os.path.join(testutils.fixture_path, 'TrieTests', 'trietestnextprev.json')
+
+        fixture = json.load(open(fn, 'r'))
     except IOError:
         raise IOError("Could not read trietests.json from fixtures",
                       "Make sure you did 'git submodule init'")