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

bahamut: lower mainloop delay, and reduce parallelism to make tests less flaky

Browse Source
This commit is contained in:
Valentin Lorentz
2022-06-18 13:14:51 +02:00
parent 53710779f0
commit 81dac6f582
5 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/test-devel.yml vendored
View File

@ -67,6 +67,7 @@ jobs:
run: | run: |
cd $GITHUB_WORKSPACE/Bahamut/ cd $GITHUB_WORKSPACE/Bahamut/
patch src/s_user.c < $GITHUB_WORKSPACE/patches/bahamut_localhost.patch patch src/s_user.c < $GITHUB_WORKSPACE/patches/bahamut_localhost.patch
patch src/s_bsd.c < $GITHUB_WORKSPACE/patches/bahamut_mainloop.patch
echo "#undef THROTTLE_ENABLE" >> include/config.h echo "#undef THROTTLE_ENABLE" >> include/config.h
libtoolize --force libtoolize --force
aclocal aclocal

1
.github/workflows/test-stable.yml vendored
View File

@ -67,6 +67,7 @@ jobs:
run: | run: |
cd $GITHUB_WORKSPACE/Bahamut/ cd $GITHUB_WORKSPACE/Bahamut/
patch src/s_user.c < $GITHUB_WORKSPACE/patches/bahamut_localhost.patch patch src/s_user.c < $GITHUB_WORKSPACE/patches/bahamut_localhost.patch
patch src/s_bsd.c < $GITHUB_WORKSPACE/patches/bahamut_mainloop.patch
echo "#undef THROTTLE_ENABLE" >> include/config.h echo "#undef THROTTLE_ENABLE" >> include/config.h
libtoolize --force libtoolize --force
aclocal aclocal

5
Makefile
View File

@ -122,7 +122,8 @@ bahamut:
$(PYTEST) $(PYTEST_ARGS) \ $(PYTEST) $(PYTEST_ARGS) \
--controller=irctest.controllers.bahamut \ --controller=irctest.controllers.bahamut \
-m 'not services' \ -m 'not services' \
-n 10 \ -n 4 \
-vv -s \
-k '$(BAHAMUT_SELECTORS)' -k '$(BAHAMUT_SELECTORS)'
bahamut-atheme: bahamut-atheme:
@ -130,7 +131,6 @@ bahamut-atheme:
--controller=irctest.controllers.bahamut \ --controller=irctest.controllers.bahamut \
--services-controller=irctest.controllers.atheme_services \ --services-controller=irctest.controllers.atheme_services \
-m 'services' \ -m 'services' \
-n 10 \
-k '$(BAHAMUT_SELECTORS)' -k '$(BAHAMUT_SELECTORS)'
bahamut-anope: bahamut-anope:
@ -138,7 +138,6 @@ bahamut-anope:
--controller=irctest.controllers.bahamut \ --controller=irctest.controllers.bahamut \
--services-controller=irctest.controllers.anope_services \ --services-controller=irctest.controllers.anope_services \
-m 'services' \ -m 'services' \
-n 10 \
-k '$(BAHAMUT_SELECTORS)' -k '$(BAHAMUT_SELECTORS)'
charybdis: charybdis:

15
patches/bahamut_mainloop.patch Normal file
View File

@ -0,0 +1,15 @@
Lower Bahamut's delay between processing incoming commands
diff --git a/src/s_bsd.c b/src/s_bsd.c
index fcc1d02..951fd8c 100644
--- a/src/s_bsd.c
+++ b/src/s_bsd.c
@@ -1458,7 +1458,7 @@ int do_client_queue(aClient *cptr)
int dolen = 0, done;
while (SBufLength(&cptr->recvQ) && !NoNewLine(cptr) &&
- ((cptr->status < STAT_UNKNOWN) || (cptr->since - timeofday < 10) ||
+ ((cptr->status < STAT_UNKNOWN) || (cptr->since - timeofday < 20) ||
IsNegoServer(cptr)))
{
/* If it's become registered as a server, just parse the whole block */

1
workflows.yml
View File

@ -105,6 +105,7 @@ software:
build_script: | build_script: |
cd $GITHUB_WORKSPACE/Bahamut/ cd $GITHUB_WORKSPACE/Bahamut/
patch src/s_user.c < $GITHUB_WORKSPACE/patches/bahamut_localhost.patch patch src/s_user.c < $GITHUB_WORKSPACE/patches/bahamut_localhost.patch
patch src/s_bsd.c < $GITHUB_WORKSPACE/patches/bahamut_mainloop.patch
echo "#undef THROTTLE_ENABLE" >> include/config.h echo "#undef THROTTLE_ENABLE" >> include/config.h
libtoolize --force libtoolize --force
aclocal aclocal