From 225de7ca0a9e861696a5a43b666090b574c4c769 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Tue, 11 Jul 2017 13:49:14 +0200 Subject: tests: update tests and implement general state tests (#14734) Tests are now included as a submodule. This should make updating easier and removes ~60MB of JSON data from the working copy. State tests are replaced by General State Tests, which run the same test with multiple fork configurations. With the new test runner, consensus tests are run as subtests by walking json files. Many hex issues have been fixed upstream since the last update and most custom parsing code is replaced by existing JSON hex types. Tests can now be marked as 'expected failures', ensuring that fixes for those tests will trigger an update to test configuration. The new test runner also supports parallel execution and the -short flag. --- accounts/keystore/keystore_plain_test.go | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'accounts') diff --git a/accounts/keystore/keystore_plain_test.go b/accounts/keystore/keystore_plain_test.go index 8c0eb52ea..a1c3bc4b6 100644 --- a/accounts/keystore/keystore_plain_test.go +++ b/accounts/keystore/keystore_plain_test.go @@ -22,6 +22,7 @@ import ( "fmt" "io/ioutil" "os" + "path/filepath" "reflect" "strings" "testing" @@ -140,21 +141,32 @@ func TestV3_PBKDF2_1(t *testing.T) { testDecryptV3(tests["wikipage_test_vector_pbkdf2"], t) } +var testsSubmodule = filepath.Join("..", "..", "tests", "testdata", "KeyStoreTests") + +func skipIfSubmoduleMissing(t *testing.T) { + if !common.FileExist(testsSubmodule) { + t.Skipf("can't find JSON tests from submodule at %s", testsSubmodule) + } +} + func TestV3_PBKDF2_2(t *testing.T) { + skipIfSubmoduleMissing(t) t.Parallel() - tests := loadKeyStoreTestV3("../../tests/files/KeyStoreTests/basic_tests.json", t) + tests := loadKeyStoreTestV3(filepath.Join(testsSubmodule, "basic_tests.json"), t) testDecryptV3(tests["test1"], t) } func TestV3_PBKDF2_3(t *testing.T) { + skipIfSubmoduleMissing(t) t.Parallel() - tests := loadKeyStoreTestV3("../../tests/files/KeyStoreTests/basic_tests.json", t) + tests := loadKeyStoreTestV3(filepath.Join(testsSubmodule, "basic_tests.json"), t) testDecryptV3(tests["python_generated_test_with_odd_iv"], t) } func TestV3_PBKDF2_4(t *testing.T) { + skipIfSubmoduleMissing(t) t.Parallel() - tests := loadKeyStoreTestV3("../../tests/files/KeyStoreTests/basic_tests.json", t) + tests := loadKeyStoreTestV3(filepath.Join(testsSubmodule, "basic_tests.json"), t) testDecryptV3(tests["evilnonce"], t) } @@ -165,8 +177,9 @@ func TestV3_Scrypt_1(t *testing.T) { } func TestV3_Scrypt_2(t *testing.T) { + skipIfSubmoduleMissing(t) t.Parallel() - tests := loadKeyStoreTestV3("../../tests/files/KeyStoreTests/basic_tests.json", t) + tests := loadKeyStoreTestV3(filepath.Join(testsSubmodule, "basic_tests.json"), t) testDecryptV3(tests["test2"], t) } -- cgit v1.2.3