From af23a7b76bb7d9e9614c07526bf0f3c3948c78ca Mon Sep 17 00:00:00 2001
From: Kirill Smelkov <kirr@nexedi.com>
Date: Tue, 3 Mar 2020 18:34:29 +0300
Subject: [PATCH] .

---
 bigfile/tests/test_filezodb.py | 3 +++
 wcfs/client/client_test.py     | 4 ++--
 wcfs/client/wcfs.cpp           | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bigfile/tests/test_filezodb.py b/bigfile/tests/test_filezodb.py
index 3123ddbe..e26ce119 100644
--- a/bigfile/tests/test_filezodb.py
+++ b/bigfile/tests/test_filezodb.py
@@ -632,6 +632,9 @@ def test_bigfile_filezodb_fmt_change():
 
             file_zodb.ZBlk_fmt_write = src_fmt
             struct.pack_into('p', vma, 0, b(src_fmt))
+            # FIXME wcfs: currently hangs with fs1 because zconn_at gives
+            # future tid for empty commit (when we do `ZBlk1 -> ZBlk1` in
+            # `ZBlk0 -> ZBlk1 | ZBlk1 -> ZBlk0`.
             transaction.commit()
 
             assert type(f.blktab[0]) is src_type
diff --git a/wcfs/client/client_test.py b/wcfs/client/client_test.py
index 482acecb..cd5b093e 100644
--- a/wcfs/client/client_test.py
+++ b/wcfs/client/client_test.py
@@ -28,8 +28,8 @@ wcfs.py/wcfs.go while running tox tests in wcfs mode.
 from __future__ import print_function, absolute_import
 
 from golang import func, defer
-from ..wcfs_test import tDB, tAt    # XXX -> absolute
-from .. import wcfs_test            # XXX -> absolute
+from wendelin.wcfs.wcfs_test import tDB, tAt
+from wendelin.wcfs import wcfs_test
 
 # XXX so that e.g. testdb is set up + ...
 def setup_module():         wcfs_test.setup_module()
diff --git a/wcfs/client/wcfs.cpp b/wcfs/client/wcfs.cpp
index 1f994cd8..6ffae874 100644
--- a/wcfs/client/wcfs.cpp
+++ b/wcfs/client/wcfs.cpp
@@ -183,7 +183,7 @@ using std::max;
 using std::vector;
 
 
-#define TRACE 1
+#define TRACE 0
 #if TRACE
 #  define trace(format, ...) log::Debugf(format, ##__VA_ARGS__)
 #else
-- 
2.30.9