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

Compare commits

base: val:e50cac1a39dccc1d5404fc68ac3b93ecb31c1b1a
Branches Tags
val:master val:bouncer-sable val:split-bouncer val:anope val:links val:sable-pg-history val:testLineTooLong val:join-key val:redaction val:named-modes val:topic-unchanged val:metadata2 val:elist-2params val:sasl-ir val:ban-privmsg val:sopel-scram val:mysql-subprocess val:chghost val:noctcp val:privmsg-servermask val:master-oragono val:master-original
..
compare: val:dacb4eb51731e20b19d2cc79324189c0bdc0b06a
Branches Tags
val:bouncer-sable val:split-bouncer val:master val:anope val:links val:sable-pg-history val:testLineTooLong val:join-key val:redaction val:named-modes val:topic-unchanged val:metadata2 val:elist-2params val:sasl-ir val:ban-privmsg val:sopel-scram val:mysql-subprocess val:chghost val:noctcp val:privmsg-servermask val:master-oragono val:master-original

1 Commits
e50cac1a39 ... dacb4eb517

Author SHA1 Message Date
Val Lorentz
dacb4eb517 Merge 6243908ecc2d11864b183101429f36121f4fe378 into 9856317a64e0b72f925bd1a77cbce7e0f460eb59 2024-06-13 19:08:32 +00:00
4 changed files with 1 additions and 10 deletions
Expand all files Collapse all files

4
irctest/controllers/base_hybrid.py
View File

@ -1,4 +1,3 @@
from pathlib import Path
import shutil import shutil
import subprocess import subprocess
from typing import Optional from typing import Optional
@ -52,8 +51,6 @@ class BaseHybridController(BaseServerController, DirectoryBasedController):
) )
else: else:
ssl_config = "" ssl_config = ""
binary_path = shutil.which(self.binary_name)
assert binary_path, f"Could not find '{binary_path}' executable"
with self.open_file("server.conf") as fd: with self.open_file("server.conf") as fd:
fd.write( fd.write(
(self.template_config).format( (self.template_config).format(
@ -63,7 +60,6 @@ class BaseHybridController(BaseServerController, DirectoryBasedController):
services_port=services_port, services_port=services_port,
password_field=password_field, password_field=password_field,
ssl_config=ssl_config, ssl_config=ssl_config,
install_prefix=Path(binary_path).parent.parent,
) )
) )
assert self.directory assert self.directory

3
irctest/controllers/hybrid.py
View File

@ -3,9 +3,6 @@ from typing import Set, Type
from .base_hybrid import BaseHybridController from .base_hybrid import BaseHybridController
TEMPLATE_CONFIG = """ TEMPLATE_CONFIG = """
module_base_path = "{install_prefix}/lib/ircd-hybrid/modules";
.include "./reference.modules.conf"
serverinfo {{ serverinfo {{
name = "My.Little.Server"; name = "My.Little.Server";
sid = "42X"; sid = "42X";

2
irctest/controllers/inspircd.py
View File

@ -101,7 +101,7 @@ TEMPLATE_V4_CONFIG = """
# HELP/HELPOP # HELP/HELPOP
<module name="help"> <module name="help">
<include file="examples/help.example.conf"> <include file="examples/help.conf.example">
""" """

2
irctest/controllers/sable.py
View File

@ -408,7 +408,6 @@ class SableController(BaseServerController, DirectoryBasedController):
], ],
cwd=self.directory, cwd=self.directory,
preexec_fn=os.setsid, preexec_fn=os.setsid,
env={"RUST_BACKTRACE": "1", **os.environ},
) )
self.pgroup_id = os.getpgid(self.proc.pid) self.pgroup_id = os.getpgid(self.proc.pid)
@ -486,7 +485,6 @@ class SableServicesController(BaseServicesController):
], ],
cwd=self.server_controller.directory, cwd=self.server_controller.directory,
preexec_fn=os.setsid, preexec_fn=os.setsid,
env={"RUST_BACKTRACE": "1", **os.environ},
) )
self.pgroup_id = os.getpgid(self.proc.pid) self.pgroup_id = os.getpgid(self.proc.pid)