Skip to content

Commit

Permalink
Fix couchdb tests
Browse files Browse the repository at this point in the history
Fix merge conflict due to recently
exported CouchDatabase fields.

Change-Id: I81dd017943d6cc5973a85662f73e6f2457b2a031
Signed-off-by: denyeart <enyeart@us.ibm.com>
  • Loading branch information
denyeart committed Apr 3, 2017
1 parent 9556ed1 commit 791123f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions core/ledger/util/couchdb/couchdb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func TestDBCreateEnsureFullCommit(t *testing.T) {
//create a new instance and database object
couchInstance, err := CreateCouchInstance(connectURL, username, password)
testutil.AssertNoError(t, err, fmt.Sprintf("Error when trying to create couch instance"))
db := CouchDatabase{couchInstance: *couchInstance, dbName: database}
db := CouchDatabase{CouchInstance: *couchInstance, DBName: database}

//create a new database
_, errdb := db.CreateDatabaseIfNotExist()
Expand Down Expand Up @@ -612,7 +612,7 @@ func TestRichQuery(t *testing.T) {
//create a new instance and database object --------------------------------------------------------
couchInstance, err := CreateCouchInstance(connectURL, username, password)
testutil.AssertNoError(t, err, fmt.Sprintf("Error when trying to create couch instance"))
db := CouchDatabase{couchInstance: *couchInstance, dbName: database}
db := CouchDatabase{CouchInstance: *couchInstance, DBName: database}

//create a new database
_, errdb := db.CreateDatabaseIfNotExist()
Expand Down

0 comments on commit 791123f

Please sign in to comment.