You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rd...@apache.org on 2010/03/07 20:52:50 UTC
svn commit: r920074 - in
/subversion/trunk/subversion/bindings/swig/python/tests: auth.py client.py
core.py delta.py mergeinfo.py pool.py ra.py repository.py run_all.py wc.py
Author: rdonch
Date: Sun Mar 7 19:52:49 2010
New Revision: 920074
URL: http://svn.apache.org/viewvc?rev=920074&view=rev
Log:
[in subversion/bindings/swig/python/tests]
* core.py,
delta.py,
pool.py,
wc.py,
mergeinfo.py,
run_all.py,
auth.py,
ra.py: Fix some code style issues found by pylint. This mostly includes
inserting whitespace, removing unneeded imports and semicolons, and
renaming identifiers colliding with reserved names.
Suggested by: bhuvan
Modified:
subversion/trunk/subversion/bindings/swig/python/tests/auth.py
subversion/trunk/subversion/bindings/swig/python/tests/client.py
subversion/trunk/subversion/bindings/swig/python/tests/core.py
subversion/trunk/subversion/bindings/swig/python/tests/delta.py
subversion/trunk/subversion/bindings/swig/python/tests/mergeinfo.py
subversion/trunk/subversion/bindings/swig/python/tests/pool.py
subversion/trunk/subversion/bindings/swig/python/tests/ra.py
subversion/trunk/subversion/bindings/swig/python/tests/repository.py
subversion/trunk/subversion/bindings/swig/python/tests/run_all.py
subversion/trunk/subversion/bindings/swig/python/tests/wc.py
Modified: subversion/trunk/subversion/bindings/swig/python/tests/auth.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/tests/auth.py?rev=920074&r1=920073&r2=920074&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/tests/auth.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/tests/auth.py Sun Mar 7 19:52:49 2010
@@ -18,7 +18,7 @@
# under the License.
#
#
-import unittest, os, setup_path, sys
+import unittest, setup_path
from svn import core
Modified: subversion/trunk/subversion/bindings/swig/python/tests/client.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/tests/client.py?rev=920074&r1=920073&r2=920074&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/tests/client.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/tests/client.py Sun Mar 7 19:52:49 2010
@@ -20,9 +20,7 @@
#
import unittest, os, weakref, tempfile, setup_path
-from svn import core, repos, fs, delta, client, wc
-from svn.core import SubversionException
-import weakref
+from svn import core, client, wc
from trac.versioncontrol.tests.svn_fs import SubversionRepositoryTestSetup, \
REPOS_PATH, REPOS_URL
@@ -78,8 +76,8 @@
# We have to free client_ctx first, since it may be holding handles
# to WC DBs
del self.client_ctx
- for dir in self.cleanup_dirs:
- core.svn_io_remove_dir(dir)
+ for directory in self.cleanup_dirs:
+ core.svn_io_remove_dir(directory)
def allocate_temp_dir(self, suffix = ""):
temp_dir_name = core.svn_dirent_internal_style(tempfile.mkdtemp(suffix))
@@ -194,30 +192,30 @@
def test_mkdir_url(self):
"""Test svn_client_mkdir2 on a file:// URL"""
- dir = urljoin(REPOS_URL+"/", "dir1")
+ directory = urljoin(REPOS_URL+"/", "dir1")
- commit_info = client.mkdir2((dir,), self.client_ctx)
+ commit_info = client.mkdir2((directory,), self.client_ctx)
self.assertEqual(commit_info.revision, 13)
self.assertEqual(self.log_message_func_calls, 1)
def test_mkdir_url_with_revprops(self):
"""Test svn_client_mkdir3 on a file:// URL, with added revprops"""
- dir = urljoin(REPOS_URL+"/", "some/deep/subdir")
+ directory = urljoin(REPOS_URL+"/", "some/deep/subdir")
- commit_info = client.mkdir3((dir,), 1, {'customprop':'value'},
+ commit_info = client.mkdir3((directory,), 1, {'customprop':'value'},
self.client_ctx)
self.assertEqual(commit_info.revision, 14)
self.assertEqual(self.log_message_func_calls, 1)
def test_log3_url(self):
"""Test svn_client_log3 on a file:// URL"""
- dir = urljoin(REPOS_URL+"/", "trunk/dir1")
+ directory = urljoin(REPOS_URL+"/", "trunk/dir1")
start = core.svn_opt_revision_t()
end = core.svn_opt_revision_t()
core.svn_opt_parse_revision(start, end, "4:0")
- client.log3((dir,), start, start, end, 1, True, False, self.log_receiver,
- self.client_ctx)
+ client.log3((directory,), start, start, end, 1, True, False,
+ self.log_receiver, self.client_ctx)
self.assertEqual(self.change_author, "john")
self.assertEqual(self.log_message, "More directories.")
self.assertEqual(len(self.changed_paths), 3)
@@ -363,11 +361,11 @@
end.kind = core.svn_opt_revision_number
end.value.number = 9
- range = core.svn_opt_revision_range_t()
- range.start = start
- range.end = end
+ rrange = core.svn_opt_revision_range_t()
+ rrange.start = start
+ rrange.end = end
- client.merge_peg3(v1x_path, (range,), end, trunk_path,
+ client.merge_peg3(v1x_path, (rrange,), end, trunk_path,
core.svn_depth_infinity, False, False, False, False,
None, self.client_ctx)
Modified: subversion/trunk/subversion/bindings/swig/python/tests/core.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/tests/core.py?rev=920074&r1=920073&r2=920074&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/tests/core.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/tests/core.py Sun Mar 7 19:52:49 2010
@@ -18,7 +18,7 @@
# under the License.
#
#
-import unittest, os
+import unittest
import svn.core
Modified: subversion/trunk/subversion/bindings/swig/python/tests/delta.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/tests/delta.py?rev=920074&r1=920073&r2=920074&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/tests/delta.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/tests/delta.py Sun Mar 7 19:52:49 2010
@@ -34,8 +34,8 @@
def testTxWindowHandler(self):
"""Test tx_invoke_window_handler"""
- src_stream = StringIO("hello world");
- target_stream = StringIO("bye world");
+ src_stream = StringIO("hello world")
+ target_stream = StringIO("bye world")
# Invoke the window_handler using a helper function
window_handler, baton = \
@@ -52,4 +52,4 @@
if __name__ == '__main__':
runner = unittest.TextTestRunner()
- runner.run(suite());
+ runner.run(suite())
Modified: subversion/trunk/subversion/bindings/swig/python/tests/mergeinfo.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/tests/mergeinfo.py?rev=920074&r1=920073&r2=920074&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/tests/mergeinfo.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/tests/mergeinfo.py Sun Mar 7 19:52:49 2010
@@ -32,7 +32,6 @@
from StringIO import StringIO
from svn import core, repos, fs
-from svn.core import SubversionException
from trac.versioncontrol.tests.svn_fs import REPOS_PATH
@@ -101,13 +100,13 @@
def test_rangelist_reverse(self):
mergeinfo = core.svn_mergeinfo_parse(self.TEXT_MERGEINFO1)
rangelist = mergeinfo.get(self.MERGEINFO_SRC)
- reversed = core.svn_rangelist_reverse(rangelist)
+ reversed_rl = core.svn_rangelist_reverse(rangelist)
expected_ranges = ((42, 41), (27, 26), (9, 2))
- for i in range(0, len(reversed)):
- self.assertEquals(reversed[i].start, expected_ranges[i][0],
- "Unexpected range start: %d" % reversed[i].start)
- self.assertEquals(reversed[i].end, expected_ranges[i][1],
- "Unexpected range end: %d" % reversed[i].end)
+ for i in range(0, len(reversed_rl)):
+ self.assertEquals(reversed_rl[i].start, expected_ranges[i][0],
+ "Unexpected range start: %d" % reversed_rl[i].start)
+ self.assertEquals(reversed_rl[i].end, expected_ranges[i][1],
+ "Unexpected range end: %d" % reversed_rl[i].end)
def test_mergeinfo_sort(self):
mergeinfo = core.svn_mergeinfo_parse(self.TEXT_MERGEINFO1)
Modified: subversion/trunk/subversion/bindings/swig/python/tests/pool.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/tests/pool.py?rev=920074&r1=920073&r2=920074&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/tests/pool.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/tests/pool.py Sun Mar 7 19:52:49 2010
@@ -30,11 +30,11 @@
def assertNotNone(self, value):
"""Assert that the specified value is not None"""
- return self.assertNotEqual(value, None);
+ return self.assertNotEqual(value, None)
def assertNone(self, value):
"""Assert that the specified value is None"""
- return self.assertEqual(value, None);
+ return self.assertEqual(value, None)
def test_object_struct_members(self):
"""Check that object struct members work correctly"""
@@ -133,7 +133,7 @@
pool = Pool(pool)
# Make sure proper exceptions are raised with incorrect input
- self.assertRaises(TypeError, lambda: Pool("abcd"));
+ self.assertRaises(TypeError, lambda: Pool("abcd"))
# Check that garbage collection is working OK
self.assertNotNone(parent_pool_ref())
@@ -165,7 +165,7 @@
pool_ref = weakref.ref(pool)
# Make sure proper exceptions are raised with incorrect input
- self.assertRaises(TypeError, lambda: svn_pool_create("abcd"));
+ self.assertRaises(TypeError, lambda: svn_pool_create("abcd"))
# Test whether pools are destroyed properly
pool = svn_pool_create(pool)
@@ -180,7 +180,7 @@
newpool2 = Pool(newpool)
svn_pool_clear(newpool)
self.assertRaises(AssertionError, lambda: libsvn.core.apr_pool_destroy(newpool2))
- self.assertRaises(AssertionError, lambda: svn_pool_destroy(newpool2));
+ self.assertRaises(AssertionError, lambda: svn_pool_destroy(newpool2))
svn_pool_destroy(newpool)
self.assertRaises(AssertionError, lambda: svn_pool_destroy(newpool))
@@ -207,7 +207,7 @@
self.assertNone(libsvn.core.application_pool)
# Try to allocate memory from the old application pool
- self.assertRaises(AssertionError, lambda: svn_pool_create(application_pool));
+ self.assertRaises(AssertionError, lambda: svn_pool_create(application_pool))
# Bring the application pool back to life
svn_pool_create()
@@ -223,4 +223,4 @@
if __name__ == '__main__':
runner = unittest.TextTestRunner()
- runner.run(suite());
+ runner.run(suite())
Modified: subversion/trunk/subversion/bindings/swig/python/tests/ra.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/tests/ra.py?rev=920074&r1=920073&r2=920074&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/tests/ra.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/tests/ra.py Sun Mar 7 19:52:49 2010
@@ -18,9 +18,9 @@
# under the License.
#
#
-import unittest, os, setup_path
+import unittest, setup_path
-from svn import core, repos, fs, delta, client, ra
+from svn import core, repos, fs, delta, ra
from sys import version_info # For Python version check
if version_info[0] >= 3:
# Python >=3.0
@@ -83,10 +83,10 @@
def test_get_latest_revnum(self):
ra_revnum = ra.get_latest_revnum(self.ra_ctx)
fs_revnum = fs.youngest_rev(self.fs)
- self.assertEqual(ra_revnum,fs_revnum)
+ self.assertEqual(ra_revnum, fs_revnum)
def test_get_dir2(self):
- (dirents,_,props) = ra.get_dir2(self.ra_ctx, '', 1, core.SVN_DIRENT_KIND)
+ (dirents, _, props) = ra.get_dir2(self.ra_ctx, '', 1, core.SVN_DIRENT_KIND)
self.assert_('trunk' in dirents)
self.assert_('branches' in dirents)
self.assert_('tags' in dirents)
@@ -96,14 +96,14 @@
self.assert_(core.SVN_PROP_ENTRY_UUID in props)
self.assert_(core.SVN_PROP_ENTRY_LAST_AUTHOR in props)
- (dirents,_,_) = ra.get_dir2(self.ra_ctx, 'trunk', 1, core.SVN_DIRENT_KIND)
+ (dirents, _, _) = ra.get_dir2(self.ra_ctx, 'trunk', 1, core.SVN_DIRENT_KIND)
self.assertEqual(dirents, {})
- (dirents,_,_) = ra.get_dir2(self.ra_ctx, 'trunk', 10, core.SVN_DIRENT_KIND)
+ (dirents, _, _) = ra.get_dir2(self.ra_ctx, 'trunk', 10, core.SVN_DIRENT_KIND)
self.assert_('README2.txt' in dirents)
- self.assertEqual(dirents['README2.txt'].kind,core.svn_node_file)
+ self.assertEqual(dirents['README2.txt'].kind, core.svn_node_file)
def test_commit3(self):
commit_info = []
@@ -238,7 +238,7 @@
def __init__(self):
self.textdeltas = []
- def apply_textdelta(self, file_baton, base_checksum):
+ def apply_textdelta(self, file_baton, base_checksum, pool=None):
def textdelta_handler(textdelta):
if textdelta is not None:
self.textdeltas.append(textdelta)
@@ -266,7 +266,7 @@
self.assertEqual(1, len(editor.textdeltas))
def test_get_locations(self):
- locations = ra.get_locations(self.ra_ctx, "trunk/README.txt", 2, list(range(1,5)))
+ locations = ra.get_locations(self.ra_ctx, "trunk/README.txt", 2, list(range(1, 5)))
self.assertEqual(locations, {
2: '/trunk/README.txt',
3: '/trunk/README.txt',
@@ -382,7 +382,7 @@
called[0] = True
return 'namestring_test'
self.callbacks.get_client_string = cb
- svn.ra.stat(self.ra_ctx, "", 1)
+ ra.stat(self.ra_ctx, "", 1)
self.assert_(called[0])
def suite():
Modified: subversion/trunk/subversion/bindings/swig/python/tests/repository.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/tests/repository.py?rev=920074&r1=920073&r2=920074&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/tests/repository.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/tests/repository.py Sun Mar 7 19:52:49 2010
@@ -18,7 +18,7 @@
# under the License.
#
#
-import unittest, os, setup_path, tempfile
+import unittest, setup_path, tempfile
from sys import version_info # For Python version check
if version_info[0] >= 3:
# Python >=3.0
@@ -40,7 +40,7 @@
self.tgt_root = tgt_root
self.textdeltas = []
- def apply_textdelta(self, file_baton, base_checksum):
+ def apply_textdelta(self, file_baton, base_checksum, pool=None):
def textdelta_handler(textdelta):
if textdelta is not None:
self.textdeltas.append(textdelta)
@@ -160,7 +160,7 @@
# Check results
self.assertEqual(editor.textdeltas[0].new_data, "This is a test.\n")
self.assertEqual(editor.textdeltas[1].new_data, "A test.\n")
- self.assertEqual(len(editor.textdeltas),2)
+ self.assertEqual(len(editor.textdeltas), 2)
def test_retrieve_and_change_rev_prop(self):
"""Test playing with revprops"""
Modified: subversion/trunk/subversion/bindings/swig/python/tests/run_all.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/tests/run_all.py?rev=920074&r1=920073&r2=920074&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/tests/run_all.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/tests/run_all.py Sun Mar 7 19:52:49 2010
@@ -18,7 +18,7 @@
# under the License.
#
#
-import sys, os, unittest, setup_path
+import unittest, setup_path
import mergeinfo, core, client, delta, pool, ra, wc, repository, auth, \
trac.versioncontrol.tests
@@ -26,18 +26,18 @@
def suite():
"""Run all tests"""
- suite = unittest.TestSuite()
- suite.addTest(core.suite())
- suite.addTest(mergeinfo.suite())
- suite.addTest(client.suite())
- suite.addTest(delta.suite())
- suite.addTest(pool.suite())
- suite.addTest(ra.suite())
- suite.addTest(wc.suite())
- suite.addTest(repository.suite())
- suite.addTest(auth.suite())
- suite.addTest(trac.versioncontrol.tests.suite());
- return suite
+ s = unittest.TestSuite()
+ s.addTest(core.suite())
+ s.addTest(mergeinfo.suite())
+ s.addTest(client.suite())
+ s.addTest(delta.suite())
+ s.addTest(pool.suite())
+ s.addTest(ra.suite())
+ s.addTest(wc.suite())
+ s.addTest(repository.suite())
+ s.addTest(auth.suite())
+ s.addTest(trac.versioncontrol.tests.suite())
+ return s
if __name__ == '__main__':
unittest.main(defaultTest='suite')
Modified: subversion/trunk/subversion/bindings/swig/python/tests/wc.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/tests/wc.py?rev=920074&r1=920073&r2=920074&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/tests/wc.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/tests/wc.py Sun Mar 7 19:52:49 2010
@@ -25,7 +25,7 @@
else:
# Python <3.0
from cStringIO import StringIO
-import unittest, os, tempfile, shutil, setup_path, binascii
+import unittest, os, tempfile, setup_path, binascii
import svn.diff
from svn import core, repos, wc, client
from svn import delta, ra
@@ -62,7 +62,7 @@
self.wc = wc.adm_open3(None, self.path, True, -1, None)
def test_entry(self):
- wc_entry = wc.entry(self.path, self.wc, True)
+ wc.entry(self.path, self.wc, True)
def test_lock(self):
readme_path = '%s/trunk/README.txt' % self.path
@@ -112,13 +112,13 @@
class MyReporter:
def __init__(self):
- self._finished_report = False
+ self.finished_report = False
def abort_report(self, pool):
pass
def finish_report(self, pool):
- self._finished_report = True
+ self.finished_report = True
def set_path(self, path, revision, start_empty, lock_token, pool):
set_paths.append(path)
@@ -142,7 +142,7 @@
True, True, False, notify, info)
# Check that the report finished
- self.assert_(reporter._finished_report)
+ self.assert_(reporter.finished_report)
self.assertEqual([''], set_paths)
self.assertEqual(1, len(infos))
@@ -333,7 +333,7 @@
got_prop_changes = []
def props_changed(path, propchanges):
for (name, value) in propchanges.items():
- (kind, unused_prefix_len) = core.svn_property_kind(name)
+ (kind, _) = core.svn_property_kind(name)
if kind != core.svn_prop_regular_kind:
continue
got_prop_changes.append((path[len(self.path) + 1:], name, value))