Commit b95e2525 authored by unknown's avatar unknown
Browse files

More testBackup fixes 


ndb/test/ndbapi/testBackup.cpp:
  Drop table after testBackup
ndb/test/src/NdbBackup.cpp:
  Remove node id
parent cee499f1

ndb/test/ndbapi/testBackup.cpp

+6 −1
Original line number Diff line number Diff line
@@ -205,6 +205,11 @@ int runClearTable(NDBT_Context* ctx, NDBT_Step* step){ 
  return NDBT_OK;

}



int runDropTable(NDBT_Context* ctx, NDBT_Step* step){

  GETNDB(step)->getDictionary()->dropTable(ctx->getTab()->getName());

  return NDBT_OK;

}



#include "bank/Bank.hpp"



int runCreateBank(NDBT_Context* ctx, NDBT_Step* step){
@@ -408,7 +413,7 @@ TESTCASE("BackupOne", 
  INITIALIZER(runRestoreOne);

  VERIFIER(runVerifyOne);

  FINALIZER(runClearTable);



  FINALIZER(runDropTable);

}

TESTCASE("BackupBank", 

	 "Test that backup and restore works during transaction load\n"

ndb/test/src/NdbBackup.cpp

+1 −2
Original line number Diff line number Diff line
@@ -149,13 +149,12 @@ NdbBackup::execRestore(bool _restore_data, 
  

  ndbout << "res: " << res << endl;

  

  snprintf(buf, 255, "%sndb_restore -c \"nodeid=%d;host=%s\" -n %d -b %d %s %s .", 

  snprintf(buf, 255, "%sndb_restore -c \"host=%s\" -n %d -b %d %s %s .", 

#if 1

	   "",

#else

	   "valgrind --leak-check=yes -v "

#endif

	   ownNodeId,

	   addr.c_str(),

	   _node_id, 

	   _backup_id,