From 1279870c01ab4c5b00224fd0400801169ad979de Mon Sep 17 00:00:00 2001 From: denyeart Date: Sun, 26 Mar 2017 10:22:39 -0400 Subject: [PATCH] Fix txmgr test failure - CouchDB query limit Test failure: FAIL: TestIteratorWithDeletes panic: interface conversion: ledger.QueryResult is nil, not *ledger.KV Fix is to set the default ledger.state.queryLimit, which was changed in https://gerrit.hyperledger.org/r/#/c/6683/. Change-Id: Ic8f2f2057e75d5fdab7982214b022875f3888a8f Signed-off-by: denyeart --- .../ledger/kvledger/txmgmt/txmgr/commontests/txmgr_test.go | 6 +++++- core/ledger/ledgerconfig/ledger_config.go | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/core/ledger/kvledger/txmgmt/txmgr/commontests/txmgr_test.go b/core/ledger/kvledger/txmgmt/txmgr/commontests/txmgr_test.go index 100d6a92c9b..01aa90b4f09 100644 --- a/core/ledger/kvledger/txmgmt/txmgr/commontests/txmgr_test.go +++ b/core/ledger/kvledger/txmgmt/txmgr/commontests/txmgr_test.go @@ -24,8 +24,13 @@ import ( "github.com/hyperledger/fabric/common/ledger/testutil" "github.com/hyperledger/fabric/core/ledger" "github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/version" + ledgertestutil "github.com/hyperledger/fabric/core/ledger/testutil" ) +func TestMain(m *testing.M) { + ledgertestutil.SetupCoreYAMLConfig("./../../../../../../peer") +} + func TestTxSimulatorWithNoExistingData(t *testing.T) { // run the tests for each environment configured in pkg_test.go for _, testEnv := range testEnvs { @@ -390,7 +395,6 @@ func testIteratorWithDeletes(t *testing.T, env testEnv) { defer itr.Close() kv, _ := itr.Next() testutil.AssertEquals(t, kv.(*ledger.KV).Key, createTestKey(3)) - kv, _ = itr.Next() testutil.AssertEquals(t, kv.(*ledger.KV).Key, createTestKey(5)) } diff --git a/core/ledger/ledgerconfig/ledger_config.go b/core/ledger/ledgerconfig/ledger_config.go index 5447396ebe4..357406bc29d 100644 --- a/core/ledger/ledgerconfig/ledger_config.go +++ b/core/ledger/ledgerconfig/ledger_config.go @@ -91,7 +91,12 @@ func GetCouchDBDefinition() *CouchDBDef { //GetQueryLimit exposes the queryLimit variable func GetQueryLimit() int { - return viper.GetInt("ledger.state.queryLimit") + queryLimit := viper.GetInt("ledger.state.queryLimit") + // if queryLimit was unset, default to 10000 + if queryLimit == 0 { + queryLimit = 10000 + } + return queryLimit } //IsHistoryDBEnabled exposes the historyDatabase variable