Fix tests
This commit is contained in:
hiro
parent
c696e656dd
commit
31c217c89a
|
|
@ -3,3 +3,5 @@ __pycache__
|
|||
*.pyc
|
||||
log
|
||||
gettor.db
|
||||
_trial_temp
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
coverage==4.5.3
|
||||
pytest==4.4.1
|
||||
34
Makefile
34
Makefile
|
|
@ -1,34 +0,0 @@
|
|||
|
||||
.PHONY: install test
|
||||
.DEFAULT: install test
|
||||
|
||||
TRIAL:=$(shell which trial)
|
||||
VERSION:=$(shell git describe)
|
||||
|
||||
define PYTHON_WHICH
|
||||
import platform
|
||||
import sys
|
||||
sys.stdout.write(platform.python_implementation())
|
||||
endef
|
||||
|
||||
PYTHON_IMPLEMENTATION:=$(shell python3 -c '$(PYTHON_WHICH)')
|
||||
|
||||
test:
|
||||
python3 setup.py test
|
||||
|
||||
coverage-test:
|
||||
ifeq ($(PYTHON_IMPLEMENTATION),PyPy)
|
||||
@echo "Detected PyPy... not running coverage."
|
||||
python setup.py test
|
||||
else
|
||||
coverage run --rcfile=".coveragerc" $(TRIAL) ./test/test_*.py
|
||||
coverage report --rcfile=".coveragerc"
|
||||
endif
|
||||
|
||||
coverage-html:
|
||||
coverage html --rcfile=".coveragerc"
|
||||
|
||||
coverage: coverage-test coverage-html
|
||||
|
||||
tags:
|
||||
find ./gettor -type f -name "*.py" -print | xargs etags
|
||||
24
README.md
24
README.md
|
|
@ -32,22 +32,42 @@ Here is a list of the main goals the new GetTor should accomplish:
|
|||
|
||||
Installing GetTor
|
||||
=================
|
||||
|
||||
```sh
|
||||
WORKON_HOME=${HOME}/venv
|
||||
export WORKON_HOME
|
||||
mkdir -p $WORKON_HOME
|
||||
source $(which virtualenvwrapper.sh)
|
||||
git clone https://git.torproject.org/gettor.git && cd gettor
|
||||
mkvirtualenv -a $PWD -r requirements.txt --unzip-setuptools --setuptools gettor
|
||||
```
|
||||
|
||||
From now on, to use BridgeDB's virtualenv, just do ``$ workon gettor``
|
||||
From now on, to use GetTor's virtualenv, just do ``$ workon gettor``
|
||||
(after sourcing virtualenvwrapper.sh, as before). To exit the virtualenv
|
||||
without exiting the shell, do ``$ deactivate``.
|
||||
|
||||
```sh
|
||||
export PYTHONPATH=$PYTHONPATH:${VIRTUAL_ENV}/lib/python/site-packages
|
||||
```
|
||||
|
||||
```sh
|
||||
$ ./scripts/create_db
|
||||
$ ./bin/gettor_service start
|
||||
```
|
||||
|
||||
Running tests
|
||||
=================
|
||||
|
||||
GetTor includes PyTest unit tests. To run the tests, first install some dependencies:
|
||||
|
||||
```sh
|
||||
pip3 install -r .test.requirements.txt
|
||||
```
|
||||
|
||||
Then you can run `pytest` against the `tests/` directory.
|
||||
|
||||
```sh
|
||||
pytest tests/
|
||||
```
|
||||
|
||||
|
||||
How does the new GetTor works?
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
service_identity=18.1.0
|
||||
pydkim=0.3
|
||||
pyopenssl=19.0.0
|
||||
dnspython=1.16.0
|
||||
validate_email=1.3
|
||||
twisted=18.9.0
|
||||
service_identity==18.1.0
|
||||
pydkim==0.3
|
||||
pyopenssl==19.0.0
|
||||
dnspython==1.16.0
|
||||
validate_email==1.3
|
||||
twisted==18.9.0
|
||||
|
|
|
|||
246
setup.py
246
setup.py
|
|
@ -9,249 +9,3 @@ the Tor Browser.
|
|||
(c) 2014, all entities within the AUTHORS file
|
||||
:license: see included LICENSE for information
|
||||
"""
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import os
|
||||
import setuptools
|
||||
import sys
|
||||
|
||||
|
||||
def get_cmdclass():
|
||||
"""Get our cmdclass dictionary for use in setuptool.setup().
|
||||
|
||||
This must be done outside the call to setuptools.setup() because we need
|
||||
to add our own classes to the cmdclass dictionary, and then update that
|
||||
dictionary with the one returned from versioneer.get_cmdclass().
|
||||
"""
|
||||
cmdclass = {'test': Trial,
|
||||
'compile_catalog': compile_catalog,
|
||||
'extract_messages': extract_messages,
|
||||
'init_catalog': init_catalog,
|
||||
'update_catalog': update_catalog}
|
||||
cmdclass.update(versioneer.get_cmdclass())
|
||||
return cmdclass
|
||||
|
||||
|
||||
def get_requirements():
|
||||
"""Extract the list of requirements from our requirements.txt.
|
||||
|
||||
:rtype: 2-tuple
|
||||
:returns: Two lists, the first is a list of requirements in the form of
|
||||
pkgname==version. The second is a list of URIs or VCS checkout strings
|
||||
which specify the dependency links for obtaining a copy of the
|
||||
requirement.
|
||||
"""
|
||||
requirements_file = os.path.join(os.getcwd(), 'requirements.txt')
|
||||
requirements = []
|
||||
links=[]
|
||||
try:
|
||||
with open(requirements_file) as reqfile:
|
||||
for line in reqfile.readlines():
|
||||
line = line.strip()
|
||||
if line.startswith('#'):
|
||||
continue
|
||||
if line.startswith(('git+', 'hg+', 'svn+')):
|
||||
line = line[line.index('+') + 1:]
|
||||
if line.startswith(
|
||||
('https://', 'git://', 'hg://', 'svn://')):
|
||||
links.append(line)
|
||||
else:
|
||||
requirements.append(line)
|
||||
|
||||
except (IOError, OSError) as error:
|
||||
print(error)
|
||||
|
||||
return requirements, links
|
||||
|
||||
|
||||
def get_template_files():
|
||||
"""Return the paths to any web resource files to include in the package.
|
||||
|
||||
:rtype: list
|
||||
:returns: Any files in :attr:`repo_templates` which match one of the glob
|
||||
patterns in :ivar:`include_patterns`.
|
||||
"""
|
||||
include_patterns = ['*.html',
|
||||
'*.txt',
|
||||
'*.asc',
|
||||
'share/*.png',
|
||||
'share/*.svg',
|
||||
'share/css/*.css',
|
||||
'share/fonts/*.woff',
|
||||
'share/fonts/*.ttf',
|
||||
'share/fonts/*.svg',
|
||||
'share/fonts/*.eot',
|
||||
'share/images/*.svg']
|
||||
template_files = []
|
||||
|
||||
for include_pattern in include_patterns:
|
||||
pattern = os.path.join(repo_templates, include_pattern)
|
||||
matches = glob(pattern)
|
||||
template_files.extend(matches)
|
||||
|
||||
return template_files
|
||||
|
||||
|
||||
def get_data_files(filesonly=False):
|
||||
"""Return any hard-coded data_files which should be distributed.
|
||||
|
||||
This is necessary so that both the distutils-derived :class:`installData`
|
||||
class and the setuptools ``data_files`` parameter include the same files.
|
||||
Call this function with ``filesonly=True`` to get a list of files suitable
|
||||
for giving to the ``package_data`` parameter in ``setuptools.setup()``.
|
||||
Or, call it with ``filesonly=False`` (the default) to get a list which is
|
||||
suitable for using as ``distutils.command.install_data.data_files``.
|
||||
|
||||
:param bool filesonly: If true, only return the locations of the files to
|
||||
install, not the directories to install them into.
|
||||
:rtype: list
|
||||
:returns: If ``filesonly``, returns a list of file paths. Otherwise,
|
||||
returns a list of 2-tuples containing: one, the directory to install
|
||||
to, and two, the files to install to that directory.
|
||||
"""
|
||||
data_files = []
|
||||
doc_files = ['README', 'TODO', 'LICENSE', 'requirements.txt']
|
||||
lang_dirs, lang_files = get_supported_langs()
|
||||
template_files = get_template_files()
|
||||
|
||||
if filesonly:
|
||||
data_files.extend(doc_files)
|
||||
for lst in lang_files, template_files:
|
||||
for filename in lst:
|
||||
if filename.startswith(pkgpath):
|
||||
# The +1 gets rid of the '/' at the beginning:
|
||||
filename = filename[len(pkgpath) + 1:]
|
||||
data_files.append(filename)
|
||||
else:
|
||||
data_files.append((install_docs, doc_files))
|
||||
for ldir, lfile in zip(lang_dirs, lang_files):
|
||||
data_files.append((ldir, [lfile,]))
|
||||
|
||||
#[sys.stdout.write("Added data_file '%s'\n" % x) for x in data_files]
|
||||
|
||||
return data_files
|
||||
|
||||
|
||||
class Trial(setuptools.Command):
|
||||
"""Twisted Trial setuptools command.
|
||||
|
||||
Based on the setuptools Trial command in Zooko's Tahoe-LAFS, as well as
|
||||
https://github.com/simplegeo/setuptools-trial/ (which is also based on the
|
||||
Tahoe-LAFS code).
|
||||
|
||||
Pieces of the original implementation of this 'test' command (that is, for
|
||||
the original pyunit-based gettor tests which, a long time ago, in a
|
||||
galaxy far far away, lived in gettor.Tests) were based on setup.py from
|
||||
Nick Mathewson's mixminion, which was based on the setup.py from Zooko's
|
||||
pyutil package, which was in turn based on
|
||||
http://mail.python.org/pipermail/distutils-sig/2002-January/002714.html.
|
||||
|
||||
Crusty, old-ass Python, like hella wut.
|
||||
"""
|
||||
description = "Run Twisted Trial-based tests."
|
||||
user_options = [
|
||||
('debug', 'b', ("Run tests in a debugger. If that debugger is pdb, will "
|
||||
"load '.pdbrc' from current directory if it exists.")),
|
||||
('debug-stacktraces', 'B', "Report Deferred creation and callback stack traces"),
|
||||
('debugger=', None, ("The fully qualified name of a debugger to use if "
|
||||
"--debug is passed (default: pdb)")),
|
||||
('disablegc', None, "Disable the garbage collector"),
|
||||
('force-gc', None, "Have Trial run gc.collect() before and after each test case"),
|
||||
('jobs=', 'j', "Number of local workers to run, a strictly positive integer"),
|
||||
('profile', None, "Run tests under the Python profiler"),
|
||||
('random=', 'Z', "Run tests in random order using the specified seed"),
|
||||
('reactor=', 'r', "Which reactor to use"),
|
||||
('reporter=', None, "Customize Trial's output with a reporter plugin"),
|
||||
('rterrors', 'e', "Realtime errors: print out tracebacks as soon as they occur"),
|
||||
('spew', None, "Print an insanely verbose log of everything that happens"),
|
||||
('testmodule=', None, "Filename to grep for test cases (-*- test-case-name)"),
|
||||
('tbformat=', None, ("Specify the format to display tracebacks with. Valid "
|
||||
"formats are 'plain', 'emacs', and 'cgitb' which uses "
|
||||
"the nicely verbose stdlib cgitb.text function")),
|
||||
('unclean-warnings', None, "Turn dirty reactor errors into warnings"),
|
||||
('until-failure', 'u', "Repeat a test (specified by -s) until it fails."),
|
||||
('without-module=\'python3 setup.py test\'', None, ("Fake the lack of the specified modules, separated "
|
||||
"with commas")),
|
||||
]
|
||||
boolean_options = ['debug', 'debug-stacktraces', 'disablegc', 'force-gc',
|
||||
'profile', 'rterrors', 'spew', 'unclean-warnings',
|
||||
'until-failure']
|
||||
|
||||
def initialize_options(self):
|
||||
self.debug = None
|
||||
self.debug_stacktraces = None
|
||||
self.debugger = None
|
||||
self.disablegc = None
|
||||
self.force_gc = None
|
||||
self.jobs = None
|
||||
self.profile = None
|
||||
self.random = None
|
||||
self.reactor = None
|
||||
self.reporter = None
|
||||
self.rterrors = None
|
||||
self.spew = None
|
||||
self.testmodule = None
|
||||
self.tbformat = None
|
||||
self.unclean_warnings = None
|
||||
self.until_failure = None
|
||||
self.without_module = None
|
||||
|
||||
def finalize_options(self):
|
||||
build = self.get_finalized_command('build')
|
||||
self.build_purelib = build.build_purelib
|
||||
self.build_platlib = build.build_platlib
|
||||
|
||||
def run(self):
|
||||
self.run_command('build')
|
||||
old_path = sys.path[:]
|
||||
sys.path[0:0] = [self.build_purelib, self.build_platlib]
|
||||
|
||||
result = 1
|
||||
try:
|
||||
result = self.run_tests()
|
||||
finally:
|
||||
sys.path = old_path
|
||||
raise SystemExit(result)
|
||||
|
||||
def run_tests(self):
|
||||
# We do the import from Twisted inside the function instead of the top
|
||||
# of the file because since Twisted is a setup_requires, we can't
|
||||
# assume that Twisted will be installed on the user's system prior, so
|
||||
# if we don't do the import here, then importing from this plugin will
|
||||
# fail.
|
||||
from twisted.scripts import trial
|
||||
|
||||
if not self.testmodule:
|
||||
self.testmodule = "test"
|
||||
|
||||
# Handle parsing the trial options passed through the setuptools
|
||||
# trial command.
|
||||
cmd_options = []
|
||||
for opt in self.boolean_options:
|
||||
if getattr(self, opt.replace('-', '_'), None):
|
||||
cmd_options.append('--%s' % opt)
|
||||
|
||||
for opt in ('debugger', 'jobs', 'random', 'reactor', 'reporter',
|
||||
'testmodule', 'tbformat', 'without-module'):
|
||||
value = getattr(self, opt.replace('-', '_'), None)
|
||||
if value is not None:
|
||||
cmd_options.extend(['--%s' % opt, value])
|
||||
|
||||
config = trial.Options()
|
||||
config.parseOptions(cmd_options)
|
||||
config['tests'] = [self.testmodule,]
|
||||
|
||||
trial._initialDebugSetup(config)
|
||||
trialRunner = trial._makeRunner(config)
|
||||
suite = trial._getSuite(config)
|
||||
|
||||
# run the tests
|
||||
if self.until_failure:
|
||||
test_result = trialRunner.runUntilFailure(suite)
|
||||
else:
|
||||
test_result = trialRunner.run(suite)
|
||||
|
||||
if test_result.wasSuccessful():
|
||||
return 0 # success
|
||||
return 1 # failure
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
"""
|
||||
This file is part of GetTor, a service providing alternative methods to download
|
||||
the Tor Browser.
|
||||
|
||||
:authors: Hiro <hiro@torproject.org>
|
||||
please also see AUTHORS file
|
||||
:copyright: (c) 2008-2014, The Tor Project, Inc.
|
||||
(c) 2014, all entities within the AUTHORS file
|
||||
:license: see included LICENSE for information
|
||||
"""
|
||||
|
||||
from __future__ import print_function
|
||||
from .gettor.utils import options
|
||||
|
||||
class EmailServiceTests(unittest.TestCase):
|
||||
|
||||
# Fail any tests which take longer than 15 seconds.
|
||||
timeout = 15
|
||||
def setUp(self):
|
||||
self.setings = options.parse_settings()
|
||||
|
||||
def test_SendMail(self):
|
||||
sendmail = Sendmail(self.settings)
|
||||
mail = Sendmail.sendmail("gettor@torproject.org", "Hello", "This is a test.")
|
||||
print(email)
|
||||
self.assertEqual(mail, True)
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
from __future__ import print_function
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from gettor.utils import options
|
||||
from gettor.services.email import sendmail
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
#!/usr/bin/env python3
|
||||
import pytest
|
||||
from twisted.trial import unittest
|
||||
from twisted.internet import defer, reactor
|
||||
from twisted.internet import task
|
||||
|
||||
from . import conftests
|
||||
|
||||
class EmailServiceTests(unittest.TestCase):
|
||||
|
||||
# Fail any tests which take longer than 15 seconds.
|
||||
timeout = 15
|
||||
def setUp(self):
|
||||
self.settings = conftests.options.parse_settings()
|
||||
self.sm_client = conftests.sendmail.Sendmail(self.settings)
|
||||
|
||||
def tearDown(self):
|
||||
print("tearDown()")
|
||||
|
||||
def test_get_interval(self):
|
||||
self.assertEqual(self.settings.get("sendmail_interval"), self.sm_client.get_interval())
|
||||
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
Loading…
Reference in New Issue