vitessdriver: fix test logic + rm address check

Signed-off-by: Derek Perkins <derek@nozzle.io>
vitessio · Dec 30, 2021 · 9fa3327 · 9fa3327
1 parent 4376661
commit 9fa3327
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/go/vt/vitessdriver/driver.go b/go/vt/vitessdriver/driver.go
@@ -255,9 +255,6 @@ func DistributedTxFromSessionToken(ctx context.Context, c Configuration) (*sql.T
 	if c.SessionToken == "" {
 		return nil, errors.New("c.SessionToken is required")
 	}
-	if c.Address == "" {
-		return nil, errors.New("c.Address is required")
-	}
 
 	db, err := OpenWithConfiguration(c)
 	if err != nil {

diff --git a/go/vt/vitessdriver/driver_test.go b/go/vt/vitessdriver/driver_test.go
@@ -689,7 +689,7 @@ func TestSessionToken(t *testing.T) {
 	}
 
 	err = noRollbackTx.Rollback()
-	if err != nil && err.Error() != "calling Rollback from a distributed tx is not allowed" {
+	if err == nil || err.Error() != "calling Rollback from a distributed tx is not allowed" {
 		t.Fatal(err)
 	}
 
@@ -700,7 +700,7 @@ func TestSessionToken(t *testing.T) {
 	}
 
 	err = noCommitTx.Commit()
-	if err != nil && err.Error() != "calling Commit from a distributed tx is not allowed" {
+	if err == nil || err.Error() != "calling Commit from a distributed tx is not allowed" {
 		t.Fatal(err)
 	}