ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-21 13:57:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

setup: remove 'trial' command. Tox is the way.

Browse Source 
This removes the "setup.py trial" and "setup.py test" aliases from
setup.cfg, and the custom Trial class from setup.py .

Note that once you have tahoe installed into a virtualenv, "trial
allmydata" is how tests are actually run (that's what tox does).

Having a command for it in setup.py offered two things: a common
setup.py-based target to start tests (like "make check" in a
GNU/automake -style project), and a convenient way to get the
PATH/PYTHONPATH right. "tox" is now the standard way to invoke tests in
python projects, and tox sets up $PATH for us.
This commit is contained in:
Brian Warner 2016-03-22 13:59:10 -07:00
parent ae1b1e02fc
commit ce088ad27c
2 changed files with 1 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.cfg
View File

@ -34,9 +34,7 @@ find_links=tahoe-deps ../tahoe-deps
[aliases]
build = update_version build
test = update_version build trial
sdist = update_version sdist
install = update_version install
develop = update_version develop
bdist_egg = update_version bdist_egg
trial = update_version trial

73
setup.py
View File

@ -95,75 +95,6 @@ trove_classifiers=[
]
# We no longer have any requirements specific to tests.
tests_require=[]
class Trial(Command):
description = "run trial (use 'bin%stahoe debug trial' for the full set of trial options)" % (os.sep,)
# This is just a subset of the most useful options, for compatibility.
user_options = [ ("no-rterrors", None, "Don't print out tracebacks as they occur."),
("rterrors", "e", "Print out tracebacks as they occur (default, so ignored)."),
("until-failure", "u", "Repeat a test (specified by -s) until it fails."),
("reporter=", None, "The reporter to use for this test run."),
("suite=", "s", "Specify the test suite."),
("quiet", None, "Don't display version numbers and paths of Tahoe dependencies."),
("coverage", "c", "Collect branch coverage information."),
]
def initialize_options(self):
self.rterrors = False
self.no_rterrors = False
self.until_failure = False
self.reporter = None
self.suite = "allmydata"
self.quiet = False
self.coverage = False
def finalize_options(self):
pass
def run(self):
args = [sys.executable, os.path.join('bin', 'tahoe')]
if self.coverage:
from errno import ENOENT
coverage_cmd = 'coverage'
try:
subprocess.call([coverage_cmd, 'help'])
except OSError as e:
if e.errno != ENOENT:
raise
coverage_cmd = 'python-coverage'
try:
rc = subprocess.call([coverage_cmd, 'help'])
except OSError as e:
if e.errno != ENOENT:
raise
print >>sys.stderr
print >>sys.stderr, "Couldn't find the command 'coverage' nor 'python-coverage'."
print >>sys.stderr, "coverage can be installed using 'pip install coverage', or on Debian-based systems, 'apt-get install python-coverage'."
sys.exit(1)
args += ['@' + coverage_cmd, 'run', '--branch', '--source=src/allmydata', '@tahoe']
if not self.quiet:
args.append('--version-and-path')
args += ['debug', 'trial']
if self.rterrors and self.no_rterrors:
raise AssertionError("--rterrors and --no-rterrors conflict.")
if not self.no_rterrors:
args.append('--rterrors')
if self.until_failure:
args.append('--until-failure')
if self.reporter:
args.append('--reporter=' + self.reporter)
if self.suite:
args.append(self.suite)
rc = subprocess.call(args)
sys.exit(rc)
GIT_VERSION_BODY = '''
# This _version.py is generated from git metadata by the tahoe setup.py.
@ -305,8 +236,7 @@ setup(name=APPNAME,
author_email='tahoe-dev@tahoe-lafs.org',
url='https://tahoe-lafs.org/',
license='GNU GPL', # see README.rst -- there is an alternative licence
cmdclass={"trial": Trial,
"update_version": UpdateVersion,
cmdclass={"update_version": UpdateVersion,
},
package_dir = {'':'src'},
packages=['allmydata',
@ -325,7 +255,6 @@ setup(name=APPNAME,
classifiers=trove_classifiers,
test_suite="allmydata.test",
install_requires=install_requires,
tests_require=tests_require,
package_data={"allmydata.web": ["*.xhtml",
"static/*.js", "static/*.png", "static/*.css",
"static/img/*.png",