From 1ef4825c324c06192291dd060697e2cefa36f091 Mon Sep 17 00:00:00 2001 From: Jaremy Creechley Date: Wed, 27 Sep 2023 19:58:42 -0700 Subject: [PATCH] refactor - tests --- datastore/fsds.nim | 7 ------- tests/datastore/backendCommonTests.nim | 6 +----- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/datastore/fsds.nim b/datastore/fsds.nim index 87fb7ad..d0eacce 100644 --- a/datastore/fsds.nim +++ b/datastore/fsds.nim @@ -213,13 +213,9 @@ iterator iter*[K, V](handle: var DbQueryHandle[K, V, FsQueryEnv[K,V]] ): ?!DbQueryResponse[K, V] = let root = $(handle.env.self.root) let basePath = $(handle.env.basePath) - echo "FS:root: ", root - echo "FS:basePath: ", basePath for path in basePath.dirIter(): - echo "FS:path: ", path if handle.cancel: - # echo "FS:CANCELLED!" break var @@ -233,7 +229,6 @@ iterator iter*[K, V](handle: var DbQueryHandle[K, V, FsQueryEnv[K,V]] let flres = (basePath / path).absolutePath().catch if flres.isErr(): - # echo "FS:ERROR: ", flres.error() yield DbQueryResponse[K,V].failure flres.error() continue @@ -243,14 +238,12 @@ iterator iter*[K, V](handle: var DbQueryHandle[K, V, FsQueryEnv[K,V]] if handle.query.value: let res = readFile[V](handle.env.self, flres.get) if res.isErr(): - # echo "FS:ERROR: ", res.error() yield DbQueryResponse[K,V].failure res.error() continue res.get() else: V.new() - # echo "FS:SUCCESS: ", key yield success (key.some, data) handle.close() diff --git a/tests/datastore/backendCommonTests.nim b/tests/datastore/backendCommonTests.nim index 3e99cee..a7fd314 100644 --- a/tests/datastore/backendCommonTests.nim +++ b/tests/datastore/backendCommonTests.nim @@ -160,11 +160,7 @@ template queryTests*( var handle = ds.query(q).tryGet let - res = handle.iter().toSeq().mapIt(block: - echo "\nRES: ", it.repr - # quit(1) - it.tryGet() - ) + res = handle.iter().toSeq().mapIt(it.tryGet()) # ).filterIt(it.isOk).mapIt(it.tryGet()) check: