Skip to content

Commit 17259af

Browse files
committed
[FAB-3402] Improve unit tests for ledger lockbasedtxmgr
Move lockbasedtxmgr unit tests from commontests directory to lockbasedtxmgr, so that unit test coverage gets reported for lockbasedtxmgr. Change-Id: Iaeda05fdb0914e5f863146c34a856198c20d0943 Signed-off-by: David Enyeart <[email protected]>
1 parent d6fbfcf commit 17259af

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

core/ledger/kvledger/txmgmt/txmgr/commontests/pkg_test.go core/ledger/kvledger/txmgmt/txmgr/lockbasedtxmgr/pkg_test.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package commontests
17+
package lockbasedtxmgr
1818

1919
import (
2020
"testing"
@@ -25,14 +25,13 @@ import (
2525
"github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/statedb/statecouchdb"
2626
"github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/statedb/stateleveldb"
2727
"github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/txmgr"
28-
"github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/txmgr/lockbasedtxmgr"
2928
"github.com/hyperledger/fabric/core/ledger/util"
3029
"github.com/hyperledger/fabric/protos/common"
3130
"github.com/spf13/viper"
3231
)
3332

3433
const (
35-
testFilesystemPath = "/tmp/fabric/ledgertests/kvledger/txmgmt/txmgr/commontests"
34+
testFilesystemPath = "/tmp/fabric/ledgertests/kvledger/txmgmt/txmgr/lockbasedtxmgr"
3635
)
3736

3837
type testEnv interface {
@@ -68,7 +67,7 @@ func (env *levelDBLockBasedEnv) init(t *testing.T, testLedgerID string) {
6867
testDB, err := testDBEnv.DBProvider.GetDBHandle(testLedgerID)
6968
testutil.AssertNoError(t, err, "")
7069

71-
txMgr := lockbasedtxmgr.NewLockBasedTxMgr(testDB)
70+
txMgr := NewLockBasedTxMgr(testDB)
7271
env.testLedgerID = testLedgerID
7372
env.testDBEnv = testDBEnv
7473
env.testDB = testDB
@@ -118,7 +117,7 @@ func (env *couchDBLockBasedEnv) init(t *testing.T, testLedgerID string) {
118117
testDB, err := testDBEnv.DBProvider.GetDBHandle(testLedgerID)
119118
testutil.AssertNoError(t, err, "")
120119

121-
txMgr := lockbasedtxmgr.NewLockBasedTxMgr(testDB)
120+
txMgr := NewLockBasedTxMgr(testDB)
122121
env.testLedgerID = testLedgerID
123122
env.testDBEnv = testDBEnv
124123
env.testDB = testDB

core/ledger/kvledger/txmgmt/txmgr/commontests/txmgr_test.go core/ledger/kvledger/txmgmt/txmgr/lockbasedtxmgr/txmgr_test.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package commontests
17+
package lockbasedtxmgr
1818

1919
import (
2020
"encoding/json"
@@ -23,6 +23,7 @@ import (
2323

2424
"os"
2525

26+
"github.com/hyperledger/fabric/common/flogging"
2627
"github.com/hyperledger/fabric/common/ledger/testutil"
2728
"github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/version"
2829
ledgertestutil "github.com/hyperledger/fabric/core/ledger/testutil"
@@ -31,6 +32,8 @@ import (
3132

3233
func TestMain(m *testing.M) {
3334
ledgertestutil.SetupCoreYAMLConfig()
35+
flogging.SetModuleLevel("lockbasedtxmgr", "debug")
36+
3437
os.Exit(m.Run())
3538
}
3639

0 commit comments

Comments
 (0)