mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-17 17:12:13 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix tests

Browse source
This commit is contained in:
ed 2022-09-18 00:16:40 +02:00
parent f85d4ce82f
commit ab36c8c9de
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
copyparty/__main__.py
View file

@ -20,7 +20,7 @@ import time
import traceback import traceback
from textwrap import dedent from textwrap import dedent
from .__init__ import ANYWIN, CORES, PY2, VT100, WINDOWS, E, unicode from .__init__ import ANYWIN, CORES, PY2, VT100, WINDOWS, E, EnvParams, unicode
from .__version__ import CODENAME, S_BUILD_DT, S_VERSION from .__version__ import CODENAME, S_BUILD_DT, S_VERSION
from .authsrv import re_vol from .authsrv import re_vol
from .svchub import SvcHub from .svchub import SvcHub
@ -132,7 +132,7 @@ def warn(msg: str) -> None:
lprint("\033[1mwarning:\033[0;33m {}\033[0m\n".format(msg)) lprint("\033[1mwarning:\033[0;33m {}\033[0m\n".format(msg))
def init_E() -> None: def init_E(E: EnvParams) -> None:
# __init__ runs 18 times when oxidized; do expensive stuff here # __init__ runs 18 times when oxidized; do expensive stuff here
def get_unixdir() -> str: def get_unixdir() -> str:
@ -774,7 +774,7 @@ def main(argv: Optional[list[str]] = None) -> None:
if WINDOWS: if WINDOWS:
os.system("rem") # enables colors os.system("rem") # enables colors
init_E() init_E(E)
if argv is None: if argv is None:
argv = sys.argv argv = sys.argv

2
scripts/run-tests.sh
View file

@ -17,8 +17,10 @@ for py in python{2,3}; do
pids+=($!) pids+=($!)
done done
[ "$1" ] || {
python3 ../scripts/test/smoketest.py & python3 ../scripts/test/smoketest.py &
pids+=($!) pids+=($!)
}
for pid in ${pids[@]}; do for pid in ${pids[@]}; do
wait $pid wait $pid

7
tests/util.py
View file

@ -30,8 +30,12 @@ if MACOS:
# 25% faster; until any tests do symlink stuff # 25% faster; until any tests do symlink stuff
from copyparty.__init__ import E
from copyparty.__main__ import init_E
from copyparty.util import Unrecv, FHC from copyparty.util import Unrecv, FHC
init_E(E)
def runcmd(argv): def runcmd(argv):
p = sp.Popen(argv, stdout=sp.PIPE, stderr=sp.PIPE) p = sp.Popen(argv, stdout=sp.PIPE, stderr=sp.PIPE)
@ -97,7 +101,7 @@ class Cfg(Namespace):
ex = "e2d e2ds e2dsa e2t e2ts e2tsr e2v e2vu e2vp xdev xvol ed emp force_js ihead no_acode no_athumb no_del no_logues no_mv no_readme no_robots no_scandir no_thumb no_vthumb no_zip nid nih nw" ex = "e2d e2ds e2dsa e2t e2ts e2tsr e2v e2vu e2vp xdev xvol ed emp force_js ihead no_acode no_athumb no_del no_logues no_mv no_readme no_robots no_scandir no_thumb no_vthumb no_zip nid nih nw"
ka.update(**{k: False for k in ex.split()}) ka.update(**{k: False for k in ex.split()})
ex = "no_rescan no_sendfile no_voldump" ex = "no_rescan no_sendfile no_voldump plain_ip"
ka.update(**{k: True for k in ex.split()}) ka.update(**{k: True for k in ex.split()})
ex = "css_browser hist js_browser no_hash no_idx no_forget" ex = "css_browser hist js_browser no_hash no_idx no_forget"
@ -113,6 +117,7 @@ class Cfg(Namespace):
a=a or [], a=a or [],
v=v or [], v=v or [],
c=c, c=c,
E=E,
s_wr_sz=512 * 1024, s_wr_sz=512 * 1024,
unpost=600, unpost=600,
u2sort="s", u2sort="s",