Fix another test.
authorJelmer Vernooij <jelmer@jelmer.uk>
Wed, 23 May 2018 22:08:52 +0000 (23:08 +0100)
committerJelmer Vernooij <jelmer@jelmer.uk>
Wed, 23 May 2018 22:08:52 +0000 (23:08 +0100)
subvertpy/client.c
subvertpy/tests/test_client.py
subvertpy/tests/test_wc.py
subvertpy/wc.c

index e85c5be7174eeb5ad540dc4aa99a5755ced3752a..86b587ce78388fd112f69c438aeb9e6e16e562ed 100644 (file)
@@ -157,6 +157,9 @@ static bool to_opt_revision(PyObject *arg, svn_opt_revision_t *ret)
         char *text;
         if (PyUnicode_Check(arg)) {
             arg = PyUnicode_AsUTF8String(arg);
+            if (arg == NULL) {
+                return false;
+            }
         } else {
             Py_INCREF(arg);
         }
index a1a0534d20f15d36c74db0e8289158bde5d44aa0..b84f86c8bef5edb7d073d482dc4a487356d9a351 100644 (file)
@@ -217,7 +217,7 @@ class TestClient(SubversionTestCase):
         self.client.log_msg_func = lambda c: commit_msg_1
         self.client.commit(["dc"])
         commit_1_dt = datetime.utcnow()
-        self.client.log(cb, "dc/foo")
+        self.client.log(cb, "dc/foo", start_rev="HEAD", end_rev=1)
         self.assertEqual(1, len(log_entries))
         self.assertEqual(None, log_entries[0]["changed_paths"])
         self.assertEqual(1, log_entries[0]["revision"])
@@ -232,7 +232,8 @@ class TestClient(SubversionTestCase):
         self.client.commit(["dc"])
         commit_2_dt = datetime.utcnow()
         log_entries = []
-        self.client.log(cb, "dc/foo", discover_changed_paths=True)
+        self.client.log(cb, "dc/foo", start_rev="HEAD", end_rev=1,
+                discover_changed_paths=True)
         self.assertEqual(2, len(log_entries))
         self.assertLogEntryChangedPathsEquals(["/foo", "/bar"], log_entries[0])
         self.assertEqual(2, log_entries[0]["revision"])
index d1fdde37316e223a2821b3fe8b26eca4715b87bc..6c4f6e622cb07004275b6c185a819e4bdc421610 100644 (file)
@@ -306,7 +306,7 @@ class AdmObjTests(SubversionTestCase):
         self.client_add('checkout/bar')
         adm = wc.Adm(None, "checkout", True)
         cq = wc.CommittedQueue()
-        cq.queue(os.path.join(self.test_dir, "checkout/bar"), adm)
+        cq.queue("checkout/bar", adm)
         adm.process_committed_queue(cq, 1, "2010-05-31T08:49:22.430000Z",
                                     "jelmer")
         bar = adm.entry("checkout/bar")
index 1179bcd61c7cff626d77b4738aad3587fbbf7f7d..500ed5dcd57e40e8a83aca001ee52c94e7c7dfcd 100644 (file)
@@ -895,7 +895,7 @@ static PyObject *committed_queue_queue(CommittedQueueObject *self, PyObject *arg
                return NULL;
        }
 
-       path = py_object_to_svn_abspath(py_path, self->pool);
+       path = py_object_to_svn_dirent(py_path, self->pool);
        if (path == NULL) {
                apr_pool_destroy(temp_pool);
                return NULL;