1. 10 May, 2001 2 commits
  2. 09 May, 2001 12 commits
  3. 08 May, 2001 10 commits
  4. 02 May, 2001 7 commits
    • Jeremy Hylton's avatar
      Fix order of return values from _undoDataInfo(). · 0e107314
      Jeremy Hylton authored
      The cdata and cver had been swapped, causing all undos to fail,
      because the version was compared to a pickle.
      0e107314
    • Jeremy Hylton's avatar
      Three new tests: · 801d193a
      Jeremy Hylton authored
      checkBuggyResolve2() -- _p_resolveConflict takes too few args
      checkUndoConflictResolution() -- make sure conflict resolution is
           invoked properly during transactional undo
      checkUndoUnresolvable() -- make sure transactional undo can cope with
           failed conflict resolution
      801d193a
    • Jeremy Hylton's avatar
      7952bbda
    • Jeremy Hylton's avatar
      Fix tests to work correctly with conflict resolution. · e1ecd8a0
      Jeremy Hylton authored
      Add new tests for conflict resolution.
      
      The old blanket try-except for conflict resolution was hiding some
      bugs caused by the pickles used in the test suite.  The conflict
      resolution code imposes some restrictions on the format of pickles.
      Basically, the conflict resolution requires that the storage API only
      accept a pickles that constructed according to the ZODB rules.
      
      XXX This new restriction sounds unfortunate, but it would require a
      substantial change to conflict resolution to remove it.
      
      The key changes to the test suite are to store only persistent objects
      and to format the pickles using the standard ZODB format.  All tests
      now use ZODB.tests.MinPO.MinPO instances for data.  The pickling is
      down with zodb_pickle() and zodb_unpickle() defined in
      StorageTestBase.
      
      Add conflict resolution tests to testFileStorage.  (They pass.)
      e1ecd8a0
    • Jeremy Hylton's avatar
      Fix conflict resolution bug in transactionalUndo. · a8f4d57d
      Jeremy Hylton authored
      The value of _loadBack() -- a pickle and a serialno -- was being
      passed to tryToResolveConflict() where only a pickle was expected.
      
      XXX _loadBack() can raise KeyError, but this wasn't handled by the
      code.  Turn into UndoError() for now.
      a8f4d57d
    • Jeremy Hylton's avatar
      Replace blanket try-except for all exceptions with try-except for · 5ab7e7c2
      Jeremy Hylton authored
      exactly one exception, ConflictError
      
      Remove klass._p_resolveConflict line, because it's only apparent
      purpose was to raise an AttributeError that was caught by the blanket
      try-except.  Instead, let the later code, which actually uses
      _p_resolveConflict() catch the AttributeError and return 0.
      5ab7e7c2
    • Jeremy Hylton's avatar
  5. 01 May, 2001 6 commits
  6. 29 Apr, 2001 1 commit
  7. 27 Apr, 2001 2 commits
    • Jeremy Hylton's avatar
      Update to support ZEO · 69645e8a
      Jeremy Hylton authored
      The ZEO version of the storage API returns serial numbers for stores
      in a different way.  These changes are the minimum needed to make the
      tests handle the ZEO way of doing things; I assume they still work
      with non-ZEO storage.
      
      XXX These tests should be cleaned up to all use
      _multi_obj_transactions(), which should probably get a different name,
      like _domultistore().
      69645e8a
    • Jeremy Hylton's avatar
      Add ZEO tests using Python 2.1 unittest framework. · e25b3271
      Jeremy Hylton authored
      All tests except checkLen() pass.
      e25b3271