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

[Ronald Blaschke]

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

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'subvertpy/_ra.c'
--- subvertpy/_ra.c	2011-09-23 23:49:59 +0000
+++ subvertpy/_ra.c	2011-11-08 15:34:57 +0000
@@ -3047,7 +3047,7 @@
 	return ret;
 }
 
-#if defined(WIN32)
+#if defined(WIN32) || defined(__CYGWIN__)
 static PyObject *get_windows_simple_provider(PyObject* self)
 {
 	AuthProviderObject *auth = PyObject_New(AuthProviderObject, &AuthProvider_Type);
@@ -3153,7 +3153,7 @@
 		return NULL;
 	}
 
-#if defined(WIN32)
+#if defined(WIN32) || defined(__CYGWIN__)
 	provider = get_windows_simple_provider(self);
 	if (provider == NULL)
 		return NULL;
@@ -3167,7 +3167,7 @@
 	PyList_Append(pylist, provider);
 	Py_DECREF(provider);
 #endif /* 1.5 */
-#endif /* WIN32 */
+#endif /* WIN32 || __CYGWIN__ */
 
 #if defined(SVN_KEYCHAIN_PROVIDER_AVAILABLE)
 	provider = get_keychain_simple_provider(self);
@@ -3193,7 +3193,7 @@
 	{ "get_ssl_client_cert_file_provider", (PyCFunction)get_ssl_client_cert_file_provider, METH_NOARGS, NULL },
 	{ "get_ssl_server_trust_file_provider", (PyCFunction)get_ssl_server_trust_file_provider, METH_NOARGS, NULL },
 	{ "get_simple_provider", (PyCFunction)get_simple_provider, METH_VARARGS, NULL },
-#if defined(WIN32)
+#if defined(WIN32) || defined(__CYGWIN__)
 	{ "get_windows_simple_provider", (PyCFunction)get_windows_simple_provider, METH_NOARGS, NULL },
 #if ONLY_SINCE_SVN(1, 5)
 	{ "get_windows_ssl_server_trust_provider", (PyCFunction)get_windows_ssl_server_trust_provider, METH_NOARGS, NULL },
 
=== modified file 'subvertpy/tests/__init__.py'
--- subvertpy/tests/__init__.py	2011-08-26 02:15:09 +0000
+++ subvertpy/tests/__init__.py	2011-11-08 15:34:57 +0000
@@ -202,6 +202,10 @@
         super(SubversionTestCase, self).setUp()
         self._init_client()
 
+    def tearDown(self):
+        del self.client_ctx
+        super(SubversionTestCase, self).tearDown()
+
     def log_message_func(self, items):
         return self.next_message
 
 
=== modified file 'subvertpy/tests/test_client.py'
--- subvertpy/tests/test_client.py	2011-09-19 21:42:24 +0000
+++ subvertpy/tests/test_client.py	2011-11-08 15:34:57 +0000
@@ -49,6 +49,10 @@
         self.repos_url = self.make_client("d", "dc")
         self.client = client.Client(auth=ra.Auth([ra.get_username_provider()]))
 
+    def tearDown(self):
+        del self.client
+        super(TestClient, self).tearDown()
+
     def test_add(self):
         self.build_tree({"dc/foo": None})
         self.client.add("dc/foo")
 
=== modified file 'subvertpy/tests/test_ra.py'
--- subvertpy/tests/test_ra.py	2011-08-26 02:15:09 +0000
+++ subvertpy/tests/test_ra.py	2011-11-08 15:34:57 +0000
@@ -53,6 +53,10 @@
         self.ra = ra.RemoteAccess(self.repos_url,
                 auth=ra.Auth([ra.get_username_provider()]))
 
+    def tearDown(self):
+        del self.ra
+        super(TestRemoteAccess, self).tearDown()
+
     def commit_editor(self):
         return self.get_commit_editor(self.repos_url)