1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00

Add convenience class for old-style Samba subunit python tests.

Change-Id: I84a97cc71cfa99c14e0c93ec19ff9eea6149bb5a
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Jelmer Vernooij 2014-11-01 20:51:46 -07:00
parent a92877f955
commit 8d8d800a0f
2 changed files with 69 additions and 13 deletions

View File

@ -0,0 +1,59 @@
#!/usr/bin/env python
# Simple subunit testrunner for python
# NOTE: DO NOT USE THIS MODULE FOR NEW CODE.
#
# Instead, use the standard subunit runner - e.g. "python -m subunit.run
# YOURMODULE".
#
# This wrapper will be removed once all tests can be run
# without it. At the moment there are various tests which still
# get e.g. credentials passed via command-line options to this
# script.
# Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2007-2014
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
import sys
# make sure the script dies immediately when hitting control-C,
# rather than raising KeyboardInterrupt. As we do all database
# operations using transactions, this is safe.
import signal
signal.signal(signal.SIGINT, signal.SIG_DFL)
# Find right directory when running from source tree
sys.path.insert(0, "bin/python")
import samba
samba.ensure_external_module("mimeparse", "mimeparse")
samba.ensure_external_module("extras", "extras")
samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")
import subunit.run
try:
from subunit.run import TestProgram
except ImportError:
from unittest import TestProgram
class TestProgram(TestProgram):
def __init__(self, module=None, argv=None):
super(TestProgram, self).__init__(module=module, argv=argv,
testRunner=subunit.run.SubunitTestRunner())

View File

@ -22,8 +22,7 @@ import optparse
import sys
sys.path.insert(0, "bin/python")
import samba
samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")
from samba.tests.subunitrun import TestProgram
import samba.getopt as options
import base64
@ -40,8 +39,6 @@ from samba.samdb import SamDB
from samba.credentials import Credentials, DONT_USE_KERBEROS
import samba.tests
from samba.tests import delete_force
from subunit.run import SubunitTestRunner
import unittest
parser = optparse.OptionParser("dirsync.py [options] <host>")
sambaopts = options.SambaOptions(parser)
@ -57,7 +54,7 @@ if len(args) < 1:
parser.print_usage()
sys.exit(1)
host = args[0]
host = args.pop()
if not "://" in host:
ldaphost = "ldap://%s" % host
ldapshost = "ldaps://%s" % host
@ -696,13 +693,13 @@ class ExtendedDirsyncTests(SimpleDirsyncTests):
self.assertEqual(str(res[0].dn), "")
runner = SubunitTestRunner()
suite = unittest.TestSuite()
suite.addTests(unittest.makeSuite(SimpleDirsyncTests))
suite.addTests(unittest.makeSuite(ExtendedDirsyncTests))
if not runner.run(suite).wasSuccessful():
rc = 1
if getattr(opts, "listtests", False):
args.insert(0, "--list")
else:
rc = 0
lp = sambaopts.get_loadparm()
samba.tests.cmdline_credentials = credopts.get_credentials(lp)
if getattr(opts, 'load_list', None):
args.insert(0, "--load-list=%s" % opts.load_list)
sys.exit(rc)
TestProgram(module=__name__, argv=[sys.argv[0]] + args)