val/irctest
1
0
Fork 0
mirror of https://github.com/progval/irctest.git synced 2025-04-05 23:09:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make openssl binary configurable, for OSX

Browse Source
This commit is contained in:
Daniel Oaks
2017-11-02 00:07:06 +00:00
committed by Valentin Lorentz
parent 86d26d6121
commit 2bc3cafd25
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
irctest/__main__.py
View File

@ -28,6 +28,7 @@ def main(args):
file=sys.stderr) file=sys.stderr)
exit(1) exit(1)
_IrcTestCase.controllerClass = controller_class _IrcTestCase.controllerClass = controller_class
_IrcTestCase.controllerClass.openssl_bin = args.openssl_bin
_IrcTestCase.show_io = args.show_io _IrcTestCase.show_io = args.show_io
_IrcTestCase.strictTests = not args.loose _IrcTestCase.strictTests = not args.loose
if args.specification: if args.specification:
@ -63,6 +64,8 @@ parser = argparse.ArgumentParser(
description='A script to test interoperability of IRC software.') description='A script to test interoperability of IRC software.')
parser.add_argument('module', type=str, parser.add_argument('module', type=str,
help='The module used to run the tested program.') help='The module used to run the tested program.')
parser.add_argument('--openssl-bin', type=str, default='openssl',
help='The openssl binary to use')
parser.add_argument('--show-io', action='store_true', parser.add_argument('--show-io', action='store_true',
help='Show input/outputs with the tested program.') help='Show input/outputs with the tested program.')
parser.add_argument('-v', '--verbose', action='count', default=1, parser.add_argument('-v', '--verbose', action='count', default=1,

8
irctest/basecontrollers.py
View File

@ -56,15 +56,15 @@ class DirectoryBasedController(_BaseController):
self.key_path = os.path.join(self.directory, 'ssl.key') self.key_path = os.path.join(self.directory, 'ssl.key')
self.pem_path = os.path.join(self.directory, 'ssl.pem') self.pem_path = os.path.join(self.directory, 'ssl.pem')
self.dh_path = os.path.join(self.directory, 'dh.pem') self.dh_path = os.path.join(self.directory, 'dh.pem')
subprocess.check_output(['openssl', 'req', '-new', '-newkey', 'rsa', subprocess.check_output([self.openssl_bin, 'req', '-new', '-newkey', 'rsa',
'-nodes', '-out', self.csr_path, '-keyout', self.key_path, '-nodes', '-out', self.csr_path, '-keyout', self.key_path,
'-batch'], '-batch'],
stderr=subprocess.DEVNULL) stderr=subprocess.DEVNULL)
subprocess.check_output(['openssl', 'x509', '-req', subprocess.check_output([self.openssl_bin, 'x509', '-req',
'-in', self.csr_path, '-signkey', self.key_path, '-in', self.csr_path, '-signkey', self.key_path,
'-out', self.pem_path], '-out', self.pem_path],
stderr=subprocess.DEVNULL) stderr=subprocess.DEVNULL)
subprocess.check_output(['openssl', 'dhparam', subprocess.check_output([self.openssl_bin, 'dhparam',
'-out', self.dh_path, '128'], '-out', self.dh_path, '128'],
stderr=subprocess.DEVNULL) stderr=subprocess.DEVNULL)
@ -80,7 +80,7 @@ class BaseServerController(_BaseController):
valid_metadata_keys, invalid_metadata_keys): valid_metadata_keys, invalid_metadata_keys):
raise NotImplementedError() raise NotImplementedError()
def registerUser(self, case, username, password=None): def registerUser(self, case, username, password=None):
raise NotImplementedByController('registration') raise NotImplementedByController('account registration')
def wait_for_port(self): def wait_for_port(self):
while not self.port_open: while not self.port_open:
time.sleep(0.1) time.sleep(0.1)