[Checkins] [zopefoundation/ZODB] f46359: windows: add missing sleep in tests checking histo...

GitHub noreply at github.com
Wed Jun 22 11:59:22 CEST 2016


  Branch: refs/heads/master
  Home:   https://github.com/zopefoundation/ZODB
  Commit: f46359ebde0afa43c05d4a6a6638ea88373d9442
      https://github.com/zopefoundation/ZODB/commit/f46359ebde0afa43c05d4a6a6638ea88373d9442
  Author: Julien Muchembled <jm at jmuchemb.eu>
  Date:   2016-06-19 (Sun, 19 Jun 2016)

  Changed paths:
    M src/ZODB/tests/HistoryStorage.py

  Log Message:
  -----------
  windows: add missing sleep in tests checking history

This also reverts commit 4905bb85171a3c05fdee9d4b43a7446981d59610:
sleeping 1ms is enough.


  Commit: 097e74a2e6b8fa920b04318a83216bd7542ad4ad
      https://github.com/zopefoundation/ZODB/commit/097e74a2e6b8fa920b04318a83216bd7542ad4ad
  Author: Julien Muchembled <jm at jmuchemb.eu>
  Date:   2016-06-19 (Sun, 19 Jun 2016)

  Changed paths:
    M src/ZODB/tests/ConflictResolution.py
    M src/ZODB/tests/testDemoStorage.py

  Log Message:
  -----------
  Check invalidation in case of conflict resolution


  Commit: 74fba08ad4dc7311ca74c5c9da51c12e0e9dca86
      https://github.com/zopefoundation/ZODB/commit/74fba08ad4dc7311ca74c5c9da51c12e0e9dca86
  Author: Vincent Pelletier <vincent at nexedi.com>
  Date:   2016-06-19 (Sun, 19 Jun 2016)

  Changed paths:
    M src/ZODB/Connection.py
    M src/ZODB/interfaces.py
    M src/ZODB/tests/BasicStorage.py
    M src/ZODB/tests/MTStorage.py
    M src/ZODB/tests/RevisionStorage.py
    M src/ZODB/tests/StorageTestBase.py
    M src/ZODB/tests/TransactionalUndoStorage.py
    M src/ZODB/tests/testDemoStorage.py

  Log Message:
  -----------
  Allow serial to be returned as late as tpc_finish

This makes possible for storage to allocate serial inside tpc_finish,
removing the requirement to serialise 2PC's second phase phase (tpc_vote
to tpc_finish/tpc_abort).

Co-Authored-By: Julien Muchembled <jm at nexedi.com>


  Commit: cf02e50a49e7d57929130e9e76a455f147337d3c
      https://github.com/zopefoundation/ZODB/commit/cf02e50a49e7d57929130e9e76a455f147337d3c
  Author: Julien Muchembled <jm at nexedi.com>
  Date:   2016-06-19 (Sun, 19 Jun 2016)

  Changed paths:
    M src/ZODB/Connection.py
    M src/ZODB/interfaces.py

  Log Message:
  -----------
  Add DeprecationWarning: IStorage.tpc_finish will have to return the committed tid


  Commit: caea03caf518f243370ac5cc01febdba6a7d701d
      https://github.com/zopefoundation/ZODB/commit/caea03caf518f243370ac5cc01febdba6a7d701d
  Author: Julien Muchembled <jm at nexedi.com>
  Date:   2016-06-19 (Sun, 19 Jun 2016)

  Changed paths:
    M src/ZODB/ConflictResolution.py
    M src/ZODB/Connection.py
    M src/ZODB/interfaces.py
    M src/ZODB/tests/testDemoStorage.py

  Log Message:
  -----------
  IStorage: simplify the API of store/tpc_finish to notify of resolved conflicts


  Commit: 568aa5330eb8182638dc768fefd59359745a1c61
      https://github.com/zopefoundation/ZODB/commit/568aa5330eb8182638dc768fefd59359745a1c61
  Author: Jim Fulton <jim at jimfulton.info>
  Date:   2016-06-21 (Tue, 21 Jun 2016)

  Changed paths:
    M src/ZODB/ConflictResolution.py
    M src/ZODB/Connection.py
    M src/ZODB/interfaces.py
    M src/ZODB/tests/BasicStorage.py
    M src/ZODB/tests/ConflictResolution.py
    M src/ZODB/tests/MTStorage.py
    M src/ZODB/tests/RevisionStorage.py
    M src/ZODB/tests/StorageTestBase.py
    M src/ZODB/tests/TransactionalUndoStorage.py
    M src/ZODB/tests/testDemoStorage.py

  Log Message:
  -----------
  Merge pull request #69 from zopefoundation/tpc_finish

Allow serial to be returned as late as tpc_finish


  Commit: f9f3ddaebac16726c387cf8b938a19566e0cfc1d
      https://github.com/zopefoundation/ZODB/commit/f9f3ddaebac16726c387cf8b938a19566e0cfc1d
  Author: Julien Muchembled <jm at nexedi.com>
  Date:   2016-06-22 (Wed, 22 Jun 2016)

  Changed paths:
    M src/ZODB/ConflictResolution.py
    M src/ZODB/Connection.py
    M src/ZODB/interfaces.py
    M src/ZODB/mvccadapter.py
    M src/ZODB/tests/BasicStorage.py
    M src/ZODB/tests/ConflictResolution.py
    M src/ZODB/tests/HistoryStorage.py
    M src/ZODB/tests/MTStorage.py
    M src/ZODB/tests/RevisionStorage.py
    M src/ZODB/tests/StorageTestBase.py
    M src/ZODB/tests/TransactionalUndoStorage.py
    M src/ZODB/tests/testDemoStorage.py

  Log Message:
  -----------
  Merge 4.x branch


Compare: https://github.com/zopefoundation/ZODB/compare/52ce05a8dadb...f9f3ddaebac1


More information about the checkins mailing list