Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
Z
zodbtools
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Merge Requests 3
    • Merge Requests 3
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Commits
  • nexedi
  • zodbtools
  • Merge Requests
  • !21

Open
Opened Oct 01, 2021 by Kirill Smelkov@kirr
  • Report abuse
Report abuse

test/gen_testdata: Fix for ZODB4

This fixes 0b6f99da (test/gen_testdata: Fix for ZODB5 > 5.5.1 + preserve database compatibility with ZODB3/py2) which broke that program on ZODB4 because there is no TransactionMetaData:

(neo) (z4-dev) (g.env) kirr@deca:~/src/neo/src/lab.nexedi.com/kirr/neo/go/zodb/btree$ go generate
Traceback (most recent call last):
  File "./testdata/gen-testdata", line 26, in <module>
    from zodbtools.test.gen_testdata import run_with_zodb4py2_compat
  File "/home/kirr/src/wendelin/z/zodbtools/zodbtools/test/gen_testdata.py", line 42, in <module>
    from ZODB.Connection import TransactionMetaData
ImportError: cannot import name TransactionMetaData
btree_test.go:22: running "./testdata/gen-testdata": exit status 1

-> Fix it, similarly to how treegen.py handles this situation in WCFS:

kirr/wendelin.core@4300d88a
https://lab.nexedi.com/kirr/wendelin.core/blob/57be0126/wcfs/internal/xbtree/xbtreetest/treegen.py

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://lab.nexedi.com/kirr/zodbtools.git y/ZODB4
git checkout -b kirr/zodbtools-y/ZODB4 FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/master
git merge --no-ff kirr/zodbtools-y/ZODB4

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 0
  • Commits 1
  • Changes 1
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: nexedi/zodbtools!21
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7