[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Fwd: svn commit: r39711 - in trunk/subversion/tests/cmdline: . svntest

From: Hyrum K. Wright <hyrum_at_hyrumwright.org>
Date: Wed, 30 Sep 2009 14:10:44 -0400

D. J.,
r39711 made the Python sqlite3 module required for running the python
testsuite. The buildbot you maintain has Python 2.4.3, but it doesn't
look like it has the sqlite3 module. When you get a minute, could you
update your buildslave to include the sqlite3 Python module?

sqlite3 ships with Python 2.5, but you can get the module for Python
2.4 on Windows from here: http://oss.itsystementwicklung.de/trac/pysqlite

Thanks,
-Hyrum

Begin forwarded message:

> From: "Hyrum K. Wright" <hyrum_at_hyrumwright.org>
> Date: September 30, 2009 12:30:56 PM EDT
> To: svn_at_subversion.tigris.org
> Subject: svn commit: r39711 - in trunk/subversion/tests/cmdline: .
> svntest
> Reply-To: dev_at_subversion.tigris.org
>
> Author: hwright
> Date: Wed Sep 30 09:30:55 2009
> New Revision: 39711
>
> Log:
> Require the sqlite3 module for running the python testsuite.
>
> This most likely breaks the windows buildbot, as it does not
> currently have
> the python sqlite3 module installed.
>
> The discussion is here: http://svn.haxx.se/dev/archive-2009-09/0557.shtml
>
> * subversion/tests/cmdline/upgrade_tests.py
> Import sqlite3 at the top level.
> (check_formt, check_dav_cache): Don't import sqlite3.
> (has_sqlite): Remove.
> (test_list): Don't make running tests conditional on the existence
> of the
> sqlite3 module (since we're now guaranteed to have it).
>
> * subversion/tests/cmdline/svntest/__init__.py:
> Attempt to import sqlite3, and if we can't, die a horrible death.
> (With a friendly error message, of course.)
>
> Modified:
> trunk/subversion/tests/cmdline/svntest/__init__.py
> trunk/subversion/tests/cmdline/upgrade_tests.py
>
> Modified: trunk/subversion/tests/cmdline/svntest/__init__.py
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/svntest/__init__.py?pathrev=39711&r1=39710&r2=39711
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- trunk/subversion/tests/cmdline/svntest/__init__.py Wed Sep 30
> 08:53:39 2009 (r39710)
> +++ trunk/subversion/tests/cmdline/svntest/__init__.py Wed Sep 30
> 09:30:55 2009 (r39711)
> @@ -10,8 +10,15 @@ if sys.hexversion < 0x2040000:
> # we're skipping this test, not failing, so exit with 0
> sys.exit(0)
>
> -# don't export this name
> +try:
> + import sqlite3
> +except ImportError:
> + sys.stderr.write('[SKIPPED] Python sqlite3 module required')
> + sys.exit(0)
> +
> +# don't export these names
> del sys
> +del sqlite3
>
> class Failure(Exception):
> 'Base class for exceptions that indicate test failure'
>
> Modified: trunk/subversion/tests/cmdline/upgrade_tests.py
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/upgrade_tests.py?pathrev=39711&r1=39710&r2=39711
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- trunk/subversion/tests/cmdline/upgrade_tests.py Wed Sep 30
> 08:53:39 2009 (r39710)
> +++ trunk/subversion/tests/cmdline/upgrade_tests.py Wed Sep 30
> 09:30:55 2009 (r39711)
> @@ -30,6 +30,7 @@
> #
>
> import os, sys, tarfile, shutil
> +import sqlite3
>
> import svntest
>
> @@ -63,8 +64,6 @@ def replace_sbox_with_tarfile(sbox, tar_
>
>
> def check_format(sbox, expected_format):
> - import sqlite3
> -
> for root, dirs, files in os.walk(sbox.wc_dir):
> db = sqlite3.connect(os.path.join(root, '.svn', 'wc.db'))
> c = db.cursor()
> @@ -81,8 +80,6 @@ def check_format(sbox, expected_format):
>
>
> def check_dav_cache(dir_path, wc_id, expected_dav_caches):
> - import sqlite3
> -
> db = sqlite3.connect(os.path.join(dir_path, '.svn', 'wc.db'))
> c = db.cursor()
>
> @@ -211,20 +208,13 @@ def upgrade_wcprops(sbox):
> ########################################################################
> # Run the tests
>
> -def has_sqlite():
> - try:
> - import sqlite3
> - return True
> - except ImportError:
> - return False
> -
> # list all tests here, starting with None:
> test_list = [ None,
> - SkipUnless(basic_upgrade, has_sqlite),
> - SkipUnless(upgrade_1_5, has_sqlite),
> - XFail(SkipUnless(update_1_5, has_sqlite)),
> + basic_upgrade,
> + upgrade_1_5,
> + XFail(update_1_5),
> logs_left_1_5,
> - SkipUnless(upgrade_wcprops, has_sqlite),
> + upgrade_wcprops,
> ]
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=2402169

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2402214
Received on 2009-09-30 20:11:03 CEST

This is an archived mail posted to the Subversion Dev mailing list.