fix: late binding issue

Author: heikoheiko

ethereum/tests/test_blocks.py

@@ -112,7 +112,7 @@ def do_test_block(filename, testname=None, testdata=None, limit=99999999):
                 run_block_test(testdata)
 else:
     fixtures = testutils.get_tests_from_file_or_dir(
-        os.path.join('fixtures', 'BlockTests'))
+        os.path.join(testutils.fixture_path, 'BlockTests'))
 
     def mk_test_func(filename, testname, testdata):
         return lambda: do_test_block(filename, testname, testdata)

ethereum/tests/test_state.py

@@ -40,7 +40,7 @@ def do_test_state(filename, testname=None, testdata=None, limit=99999999):
                 testutils.check_state_test(testdata)
 else:
     fixtures = testutils.get_tests_from_file_or_dir(
-        os.path.join('fixtures', 'StateTests'))
+        os.path.join(testutils.fixture_path, 'StateTests'))
 
     filenames = sorted(list(fixtures.keys()))
     for filename in filenames:

ethereum/tests/test_transactions.py

@@ -62,12 +62,12 @@ def run_test(filename, testname, testdata):
                 run_test(filename, testname, testdata)
 else:
     fixtures = testutils.get_tests_from_file_or_dir(
-        os.path.join('fixtures', 'TransactionTests'))
-    for filename, tests in list(fixtures.items()):
+        os.path.join(testutils.fixture_path, 'TransactionTests'))
 
-        def mk_test_func(filename, testname, testdata):
-            return lambda: run_test(filename, testname, testdata)
+    def mk_test_func(filename, testname, testdata):
+        return lambda: run_test(filename, testname, testdata)
 
+    for filename, tests in list(fixtures.items()):
         for testname, testdata in list(tests.items()):
             func_name = 'test_%s_%s' % (filename, testname)
             globals()[func_name] = mk_test_func(filename, testname, testdata)

ethereum/tests/test_vm.py

@@ -34,13 +34,12 @@ def do_test_vm(filename, testname=None, testdata=None, limit=99999999):
                 testutils.check_vm_test(testdata)
 else:
     fixtures = testutils.get_tests_from_file_or_dir(
-        os.path.join('fixtures', 'VMTests'))
+        os.path.join(testutils.fixture_path, 'VMTests'))
 
     def mk_test_func(filename, testname, testdata):
         return lambda: do_test_vm(filename, testname, testdata)
 
     for filename, tests in list(fixtures.items()):
         for testname, testdata in list(tests.items()):
             func_name = 'test_%s_%s' % (filename, testname)
-
             globals()[func_name] = mk_test_func(filename, testname, testdata)

ethereum/testutils.py

@@ -38,6 +38,7 @@
 check_ethash_test = lambda params: run_ethash_test(params, VERIFY)
 time_ethash_test = lambda params: run_ethash_test(params, TIME)
 
+fixture_path = os.path.join(os.path.dirname(__file__), '..', 'fixtures')
 
 def parse_int_or_hex(s):
     if s[:2] == b'0x':