From 76db5758e970c2cb2909a4311c28d474fb143a0a Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Sun, 27 Jun 2021 17:09:51 +0200 Subject: [PATCH] Remove ircd-seven A future commit will need Chary and its subclasses to use SASL, but ircd-seven has a different config to use SASL. And ircd-seven is not used anymore AFAICT, and won't be getting any updates, so I don't want to bother. --- .github/workflows/ircd-seven.yml | 59 ------------------------------- README.md | 12 ------- irctest/controllers/ircd_seven.py | 12 ------- 3 files changed, 83 deletions(-) delete mode 100644 .github/workflows/ircd-seven.yml delete mode 100644 irctest/controllers/ircd_seven.py diff --git a/.github/workflows/ircd-seven.yml b/.github/workflows/ircd-seven.yml deleted file mode 100644 index b1e6a75..0000000 --- a/.github/workflows/ircd-seven.yml +++ /dev/null @@ -1,59 +0,0 @@ -name: irctest with ircd-seven - -on: - push: - pull_request: - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - - uses: actions/checkout@v2 - - - name: Set up Python 3.7 - uses: actions/setup-python@v2 - with: - python-version: 3.7 - - - name: Cache dependencies - uses: actions/cache@v2 - with: - path: | - ~/.cache - $GITHUB_WORKSPACE/ircd-seven - key: ${{ runner.os }}-ircd-seven - - - name: Install dependencies - run: | - sudo apt-get install libhyperscan-dev - python -m pip install --upgrade pip - pip install pytest -r requirements.txt - - - name: Checkout ircd-seven - uses: actions/checkout@v2 - with: - repository: freenode/ircd-seven - ref: ircd-seven-1.1.9 - path: ircd-seven - - - name: Build ircd-seven - run: | - cd $GITHUB_WORKSPACE/ircd-seven/ - autoconf - ./configure --prefix=$HOME/.local/ - make # can't use -j, may cause 'y.tab.h: No such file or directory' - make install - mv $HOME/.local/bin/ircd $HOME/.local/bin/ircd-seven - - - name: Test with pytest - run: | - # testNakWhole fails because ircd-seven sends a trailing space in CAP ACK - # testPartMessage and testBasicPartRfc2812 fail because ircd-seven adds quotes around the message - # testListOne fails because ircd-seven makes channels secret by default - # testQuitErrors is very flaky - PATH=~/.local/bin:$PATH pytest --controller=irctest.controllers.ircd_seven -k 'not Ergo and not deprecated and not strict and not testDoubleKickMessages and not testNakWhole and not testPartMessage and not testBasicPartRfc2812 and not testListOne and not testQuitErrors' - - diff --git a/README.md b/README.md index 77eb145..e0ae961 100644 --- a/README.md +++ b/README.md @@ -103,18 +103,6 @@ cd ~/irctest pytest --controller irctest.controllers.charybdis -k 'not Ergo and not deprecated and not strict' ``` -To run (server) tests on ircd-seven: - -``` -cd /tmp/ -git clone https://github.com/freenode/ircd-seven.git -autoconf -./configure --prefix=$HOME/.local/ -make # can't use -j, may cause 'y.tab.h: No such file or directory' -make install -mv $HOME/.local/bin/ircd $HOME/.local/bin/ircd-seven -``` - To run (server) tests on InspIRCd: ``` diff --git a/irctest/controllers/ircd_seven.py b/irctest/controllers/ircd_seven.py deleted file mode 100644 index c6bd3f1..0000000 --- a/irctest/controllers/ircd_seven.py +++ /dev/null @@ -1,12 +0,0 @@ -from typing import Type - -from .charybdis import CharybdisController - - -class IrcdSevenController(CharybdisController): - software_name = "ircd-seven" - binary_name = "ircd-seven" - - -def get_irctest_controller_class() -> Type[IrcdSevenController]: - return IrcdSevenController