subvertpy

Merge lp:~rblasch/subvertpy/svn1.6-cygwin into lp:~jelmer/subvertpy/trunk

  1. svn1.6-cygwin
  2. Merge into trunk
Proposed by Ronald Blaschke
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 2418
Merged at revision: 2417
Proposed branch: lp:~rblasch/subvertpy/svn1.6-cygwin
Merge into: lp:~jelmer/subvertpy/trunk
Diff against target: 83 lines (+16/-4)
4 files modified
subvertpy/_ra.c (+4/-4)
subvertpy/tests/__init__.py (+4/-0)
subvertpy/tests/test_client.py (+4/-0)
subvertpy/tests/test_ra.py (+4/-0)
To merge this branch: bzr merge lp:~rblasch/subvertpy/svn1.6-cygwin
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+81596@code.launchpad.net

Description of the change

Some small changes for Cygwin using Subversion 1.6.

* Makes the test suite pass.
* Add Windows SVN auth. windows-cryptoapi password store is used by default
  on Cygwin.

$ make check
python setup.py build_ext --inplace
running build_ext
PYTHONPATH=.: python -m unittest2.__main__ subvertpy.tests.test_suite
........................................................................................................................................................................
----------------------------------------------------------------------
Ran 168 tests in 16.844s

OK

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'subvertpy/_ra.c'
2--- subvertpy/_ra.c 2011-09-23 23:49:59 +0000
3+++ subvertpy/_ra.c 2011-11-08 15:34:57 +0000
4@@ -3047,7 +3047,7 @@
5 return ret;
6 }
7
8-#if defined(WIN32)
9+#if defined(WIN32) || defined(__CYGWIN__)
10 static PyObject *get_windows_simple_provider(PyObject* self)
11 {
12 AuthProviderObject *auth = PyObject_New(AuthProviderObject, &AuthProvider_Type);
13@@ -3153,7 +3153,7 @@
14 return NULL;
15 }
16
17-#if defined(WIN32)
18+#if defined(WIN32) || defined(__CYGWIN__)
19 provider = get_windows_simple_provider(self);
20 if (provider == NULL)
21 return NULL;
22@@ -3167,7 +3167,7 @@
23 PyList_Append(pylist, provider);
24 Py_DECREF(provider);
25 #endif /* 1.5 */
26-#endif /* WIN32 */
27+#endif /* WIN32 || __CYGWIN__ */
28
29 #if defined(SVN_KEYCHAIN_PROVIDER_AVAILABLE)
30 provider = get_keychain_simple_provider(self);
31@@ -3193,7 +3193,7 @@
32 { "get_ssl_client_cert_file_provider", (PyCFunction)get_ssl_client_cert_file_provider, METH_NOARGS, NULL },
33 { "get_ssl_server_trust_file_provider", (PyCFunction)get_ssl_server_trust_file_provider, METH_NOARGS, NULL },
34 { "get_simple_provider", (PyCFunction)get_simple_provider, METH_VARARGS, NULL },
35-#if defined(WIN32)
36+#if defined(WIN32) || defined(__CYGWIN__)
37 { "get_windows_simple_provider", (PyCFunction)get_windows_simple_provider, METH_NOARGS, NULL },
38 #if ONLY_SINCE_SVN(1, 5)
39 { "get_windows_ssl_server_trust_provider", (PyCFunction)get_windows_ssl_server_trust_provider, METH_NOARGS, NULL },
40
41=== modified file 'subvertpy/tests/__init__.py'
42--- subvertpy/tests/__init__.py 2011-08-26 02:15:09 +0000
43+++ subvertpy/tests/__init__.py 2011-11-08 15:34:57 +0000
44@@ -202,6 +202,10 @@
45 super(SubversionTestCase, self).setUp()
46 self._init_client()
47
48+ def tearDown(self):
49+ del self.client_ctx
50+ super(SubversionTestCase, self).tearDown()
51+
52 def log_message_func(self, items):
53 return self.next_message
54
55
56=== modified file 'subvertpy/tests/test_client.py'
57--- subvertpy/tests/test_client.py 2011-09-19 21:42:24 +0000
58+++ subvertpy/tests/test_client.py 2011-11-08 15:34:57 +0000
59@@ -49,6 +49,10 @@
60 self.repos_url = self.make_client("d", "dc")
61 self.client = client.Client(auth=ra.Auth([ra.get_username_provider()]))
62
63+ def tearDown(self):
64+ del self.client
65+ super(TestClient, self).tearDown()
66+
67 def test_add(self):
68 self.build_tree({"dc/foo": None})
69 self.client.add("dc/foo")
70
71=== modified file 'subvertpy/tests/test_ra.py'
72--- subvertpy/tests/test_ra.py 2011-08-26 02:15:09 +0000
73+++ subvertpy/tests/test_ra.py 2011-11-08 15:34:57 +0000
74@@ -53,6 +53,10 @@
75 self.ra = ra.RemoteAccess(self.repos_url,
76 auth=ra.Auth([ra.get_username_provider()]))
77
78+ def tearDown(self):
79+ del self.ra
80+ super(TestRemoteAccess, self).tearDown()
81+
82 def commit_editor(self):
83 return self.get_commit_editor(self.repos_url)
84

Subscribers

People subscribed via source and target branches