Fix unit tests pick-child-to-flush (#12)

An unlink failed because the file did not exist; ignore an unilnk failure. Put a fix back in for this test as well.
oscarlab · Jan 30, 2020 · 1e19c85 · 1e19c85
1 parent d58ec6e
commit 1e19c85
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/ft/kernel_tests/test-pick-child-to-flush.cc b/ft/kernel_tests/test-pick-child-to-flush.cc
@@ -104,7 +104,7 @@ extern int ftfs_get_errno(void);
 static TOKUTXN const null_txn = 0;
 static DB * const null_db = 0;
 
-enum { NODESIZE = 1024, KSIZE=NODESIZE-100, TOKU_PSIZE=20 };
+enum { NODESIZE = 1124, KSIZE=NODESIZE-100, TOKU_PSIZE=20 };
 
 static CACHETABLE ct;
 static FT_HANDLE t;
@@ -171,7 +171,6 @@ static int doit (void) {
 
     toku_cachetable_create(&ct, 500*1024*1024, ZERO_LSN, NULL_LOGGER);
     r = unlink(fname);
-    assert(r==0);
 
     r = toku_open_ft_handle(fname, 1, &t, NODESIZE, NODESIZE/2, TOKU_DEFAULT_COMPRESSION_METHOD, ct, null_txn, toku_builtin_compare_fun);
     assert(r==0);

diff --git a/ftfs/userspace-testing/all.tests b/ftfs/userspace-testing/all.tests
@@ -369,7 +369,7 @@ recovery-no-datadir
 recovery-lsn-error-during-forward-scan
 hot-with-bounds
 inc-split
-#pick-child-to-flush
+pick-child-to-flush
 oexcl
 cachetable-cleaner-checkpoint
 cachetable-kibbutz-and-flush-cachefile