Commit af23a7b7 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent d28f449e
...@@ -632,6 +632,9 @@ def test_bigfile_filezodb_fmt_change(): ...@@ -632,6 +632,9 @@ def test_bigfile_filezodb_fmt_change():
file_zodb.ZBlk_fmt_write = src_fmt file_zodb.ZBlk_fmt_write = src_fmt
struct.pack_into('p', vma, 0, b(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() transaction.commit()
assert type(f.blktab[0]) is src_type assert type(f.blktab[0]) is src_type
......
...@@ -28,8 +28,8 @@ wcfs.py/wcfs.go while running tox tests in wcfs mode. ...@@ -28,8 +28,8 @@ wcfs.py/wcfs.go while running tox tests in wcfs mode.
from __future__ import print_function, absolute_import from __future__ import print_function, absolute_import
from golang import func, defer from golang import func, defer
from ..wcfs_test import tDB, tAt # XXX -> absolute from wendelin.wcfs.wcfs_test import tDB, tAt
from .. import wcfs_test # XXX -> absolute from wendelin.wcfs import wcfs_test
# XXX so that e.g. testdb is set up + ... # XXX so that e.g. testdb is set up + ...
def setup_module(): wcfs_test.setup_module() def setup_module(): wcfs_test.setup_module()
......
...@@ -183,7 +183,7 @@ using std::max; ...@@ -183,7 +183,7 @@ using std::max;
using std::vector; using std::vector;
#define TRACE 1 #define TRACE 0
#if TRACE #if TRACE
# define trace(format, ...) log::Debugf(format, ##__VA_ARGS__) # define trace(format, ...) log::Debugf(format, ##__VA_ARGS__)
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment