Commit ee80468d authored by Leonard Marschke's avatar Leonard Marschke 👾
Browse files

do not allow to fail anymore

parent 3ac6a8a5

.gitlab-ci.yml

+5 −9
Changes for .gitlab-ci.yml: 5 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ groupA: 
  script:

    - dockerfiles/A/build.sh

    - mkdir -p results

    - python3 run.py testing.marschke.me 9001 sre18groupa/smtp-server-group-a 6666 | tee results/group-a

    - python3 run.py testing.marschke.me 9001 sre18groupa/smtp-server-group-a 6666 2>&1 | tee results/group-a

  artifacts:

    paths:

      - results/group-a
@@ -36,12 +36,11 @@ groupB: 
  script:

    - dockerfiles/B/build.sh

    - mkdir -p results

    - python3 run.py testing.marschke.me 9001 sregroupb/smtp-server 8008 | tee results/group-b

    - python3 run.py testing.marschke.me 9001 sregroupb/smtp-server 8008 2>&1 | tee results/group-b

  artifacts:

    paths:

      - results/group-b

    expire_in: 1 week

  allow_failure: true



groupC:

  stage: test
@@ -50,12 +49,11 @@ groupC: 
  script:

    - dockerfiles/C/build.sh

    - mkdir -p results

    - python3 run.py testing.marschke.me 9001 sregroupc/smtp-server 5555 | tee results/group-c

    - python3 run.py testing.marschke.me 9001 sregroupc/smtp-server 5555 2>&1 | tee results/group-c

  artifacts:

    paths:

      - results/group-c

    expire_in: 1 week

  allow_failure: true



groupD:

  stage: test
@@ -64,12 +62,11 @@ groupD: 
  script:

    - dockerfiles/D/build.sh

    - mkdir -p results

    - python3 run.py testing.marschke.me 9001 sregroupd/sre-smtp-group-d 25 | tee results/group-d

    - python3 run.py testing.marschke.me 9001 sregroupd/sre-smtp-group-d 25 2>&1 | tee results/group-d

  artifacts:

    paths:

      - results/group-d

    expire_in: 1 week

  allow_failure: true



groupE:

  stage: test
@@ -78,12 +75,11 @@ groupE: 
  script:

    - dockerfiles/E/build.sh

    - mkdir -p results

    - python3 run.py testing.marschke.me 9001 julianweise/simplesmtp 4431 --ssl --wait-up 2 | tee results/group-e

    - python3 run.py testing.marschke.me 9001 julianweise/simplesmtp 4431 --ssl --wait-up 2 2>&1 | tee results/group-e

  artifacts:

    paths:

      - results/group-e

    expire_in: 1 week

  allow_failure: true



results:

  stage: aggregation

run.py

+1 −2
Changes for run.py: 1 added line, 2 removed lines.
Original line number Diff line number Diff line 
import argparse

import sys

import unittest



from tests import TestDrops, TestFuzzing, TestMail, TestSession
@@ -37,4 +36,4 @@ def main(): 




if __name__ == '__main__':

    sys.exit(main())
 
    main()

tests/TestSession.py

+4 −4
Changes for tests/TestSession.py: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ class TestSession(BaseTest): 


        self.assertResponse(500, 'FAIL\r\n')



    def test_post_invalid_parameter_stability_0(self):

        self.assertResponse(250, b'EHLO localhost\r\n')

    def test_invalid_parameter_stability_0(self):

        self.assertResponse(250, b'HELO localhost\r\n')

        self.assertResponse(500, b'MAIL wrong input blabla\r\n')

        self.assertResponse(250, b'MAIL FROM:<correct.mail@test.de>\r\n')



    def test_post_invalid_parameter_stability_1(self):

        self.assertResponse(250, b'EHLO localhost\r\n')

    def test_invalid_parameter_stability_1(self):

        self.assertResponse(250, b'HELO localhost\r\n')

        self.assertResponse(250, b'MAIL FROM:<correct.mail@test.de>\r\n')

        self.assertResponse(500, b'RCPT wrong input blabla\r\n')

        self.assertResponse(250, b'RCPT TO:<correct@localhost>\r\n')