From 28b165b7b809ffeb5920cc5455aed2440aaf4cfa Mon Sep 17 00:00:00 2001 From: David Kagan Date: Wed, 1 Mar 2023 10:52:04 -0500 Subject: [PATCH] 3 todos in delete_database --- dax/test/dax/dax_test.go | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/dax/test/dax/dax_test.go b/dax/test/dax/dax_test.go index b4e757f71..9628d839a 100644 --- a/dax/test/dax/dax_test.go +++ b/dax/test/dax/dax_test.go @@ -557,28 +557,19 @@ func TestDAXIntegration(t *testing.T) { // Make sure the database and tables no longer exist. db, err = controllerClient.DatabaseByName(ctx, orgID, dbname) if assert.Error(t, err) { - assert.Contains(t, err.Error(), "database name 'dbname1' does not exist") - // TODO(tlt): replace the previous line with the following once we - // have threaded error codes through the http calls. - // assert.True(t, errors.Is(err, dax.ErrDatabaseNameDoesNotExist)) + assert.True(t, errors.Is(err, dax.ErrDatabaseNameDoesNotExist)) } assert.Nil(t, db) tbl1, err = controllerClient.TableByName(ctx, qdbid, dax.TableName(defs.Keyed.Name(0))) if assert.Error(t, err) { - assert.Contains(t, err.Error(), "table name 'keyed' does not exist") - // TODO(tlt): replace the previous line with the following once we - // have threaded error codes through the http calls. - // assert.True(t, errors.Is(err, dax.ErrTableNameDoesNotExist)) + assert.True(t, errors.Is(err, dax.ErrTableNameDoesNotExist)) } assert.Nil(t, tbl1) tbl2, err = controllerClient.TableByName(ctx, qdbid, dax.TableName(defs.Unkeyed.Name(0))) if assert.Error(t, err) { - assert.Contains(t, err.Error(), "table name 'unkeyed' does not exist") - // TODO(tlt): replace the previous line with the following once we - // have threaded error codes through the http calls. - // assert.True(t, errors.Is(err, dax.ErrTableNameDoesNotExist)) + assert.True(t, errors.Is(err, dax.ErrTableNameDoesNotExist)) } assert.Nil(t, tbl2) })