val
/
irctest
mirror of https://github.com/progval/irctest.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

first pass at renaming oragono to ergo

This commit is contained in:
Shivaram Lingamneni 2021-05-26 16:02:22 -04:00
parent db0c64fa30
commit 6bdfdf58b2
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -5,5 +5,5 @@ all: flakes oragono
flakes:
pyflakes3 ./irctest/cases.py ./irctest/client_mock.py ./irctest/controllers/oragono.py irctest/server_tests/*.py
oragono:
python3 -m pytest -k "not deprecated" --controller irctest.controllers.oragono
ergo:
python3 -m pytest -k "not deprecated" --controller irctest.controllers.ergo

12
irctest/controllers/oragono.py → irctest/controllers/ergo.py
View File

@ -127,7 +127,7 @@ def hash_password(password: Union[str, bytes]) -> str:
# simulate entry of password and confirmation:
input_ = password + b"\n" + password + b"\n"
p = subprocess.Popen(
["oragono", "genpasswd"], stdin=subprocess.PIPE, stdout=subprocess.PIPE
["ergo", "genpasswd"], stdin=subprocess.PIPE, stdout=subprocess.PIPE
)
out, _ = p.communicate(input_)
return out.decode("utf-8")
@ -199,10 +199,10 @@ class OragonoController(BaseServerController, DirectoryBasedController):
self._config_path = os.path.join(self.directory, "server.yml")
self._config = config
self._write_config()
subprocess.call(["oragono", "initdb", "--conf", self._config_path, "--quiet"])
subprocess.call(["oragono", "mkcerts", "--conf", self._config_path, "--quiet"])
subprocess.call(["ergo", "initdb", "--conf", self._config_path, "--quiet"])
subprocess.call(["ergo", "mkcerts", "--conf", self._config_path, "--quiet"])
self.proc = subprocess.Popen(
["oragono", "run", "--conf", self._config_path, "--quiet"]
["ergo", "run", "--conf", self._config_path, "--quiet"]
)
def registerUser(
@ -254,9 +254,9 @@ class OragonoController(BaseServerController, DirectoryBasedController):
config["datastore"]["mysql"] = {
"enabled": True,
"host": "localhost",
"user": "oragono",
"user": "ergo",
"password": mysql_password,
"history-database": "oragono_history",
"history-database": "ergo_history",
"timeout": "3s",
}
config["accounts"]["multiclient"] = {