Rev 999: Fix error tests. in file:///data/jelmer/bzr-svn/pyrex/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/pyrex/

------------------------------------------------------------
revno: 999
revision-id:jelmer at samba.org-20080317202554-e17epip0mphf3fyq
parent: jelmer at samba.org-20080316175735-7mjfia3x76q7p63z
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pyrex
timestamp: Mon 2008-03-17 21:25:54 +0100
message:
  Fix error tests.
modified:
  core.pyx                       core.pyx-20080313210413-17k59slolpfe5kdq-1
  delta.py                       delta.py-20080316001917-xyng7m3jlxvdc4c9-1
  logwalker.py                   logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
  tests/test_commit.py           test_commit.py-20060624213521-l5kcufywkh9mnilk-1
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'core.pyx'
--- a/core.pyx	2008-03-16 17:57:35 +0000
+++ b/core.pyx	2008-03-17 20:25:54 +0000
@@ -49,7 +49,7 @@
     return NULL
 
 class SubversionException(Exception):
-    def __init__(self, num, msg):
+    def __init__(self, msg, num):
         Exception.__init__(self, msg, num)
         self.num = num
         self.msg = msg
@@ -61,9 +61,9 @@
 cdef check_error(svn_error_t *error):
     if error:
         if error.message != NULL:
-            raise SubversionException(error.apr_err, error.message)
+            raise SubversionException(error.message, error.apr_err)
         else:
-            raise SubversionException(error.apr_err, None)
+            raise SubversionException(None, error.apr_err)
 
 cdef apr_pool_t *Pool(apr_pool_t *parent):
     cdef apr_status_t status

=== modified file 'delta.py'
--- a/delta.py	2008-03-16 17:57:35 +0000
+++ b/delta.py	2008-03-17 20:25:54 +0000
@@ -29,7 +29,6 @@
     for (action, offset, length) in ops:
         if action == 0:
             # Copy from source area.
-            assert offset + length <= sview_len
             tview += sview[offset:offset+length]
         elif action == 1:
             for i in xrange(length):

=== modified file 'logwalker.py'
--- a/logwalker.py	2008-03-16 17:57:35 +0000
+++ b/logwalker.py	2008-03-17 20:25:54 +0000
@@ -97,7 +97,7 @@
                      (revision, p.strip("/"), action, copyfrom_path, copyfrom_rev))
 
             self.saved_revnum = revision
-            if self.saved_revnum % 1000 == 0:
+            if self.saved_revnum % 10000 == 0:
                 self.db.commit()
 
         try:

=== modified file 'tests/test_commit.py'
--- a/tests/test_commit.py	2008-03-16 17:57:35 +0000
+++ b/tests/test_commit.py	2008-03-17 20:25:54 +0000
@@ -569,8 +569,6 @@
         set_svn_revprops(transport, 1, {"svn:author": "Somebody", 
                                         "svn:date": time_to_cstring(1000000*473385600)})
 
-        import pdb
-        pdb.set_trace()
         self.assertEquals(("Somebody", "1985-01-01T00:00:00.000000Z", "My commit"), 
                           self.client_log("dc")[1][1:])
 

=== modified file 'workingtree.py'
--- a/workingtree.py	2008-03-16 14:17:23 +0000
+++ b/workingtree.py	2008-03-17 20:25:54 +0000
@@ -526,8 +526,7 @@
             adm = self._get_wc(os.path.dirname(f), write_lock=True)
             try:
                 try:
-                    adm.add(os.path.join(self.basedir, f), None, 0, 
-                            None, None, None)
+                    adm.add(os.path.join(self.basedir, f))
                     if ids is not None:
                         self._change_fileid_mapping(ids.next(), f, adm)
                 except SubversionException, (_, num):