diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a214d6953b86dc06cd116bc87a52b2f811822ae0..c7b8c858c1bf4370f219f0c13fe57d6facc6fbac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,6 @@ gnupg debian-keyring python3-git - python3-testfixtures libjs-bootstrap4 fonts-fork-awesome libjs-jquery-datatables diff --git a/dsa/tests/test_housekeeping.py b/dsa/tests/test_housekeeping.py index aefb5f02e5f02dc29a46df8c07dc93836aecf475..407834a51bb37e8dea0a4adeefe0ba8e765189d2 100644 --- a/dsa/tests/test_housekeeping.py +++ b/dsa/tests/test_housekeeping.py @@ -7,7 +7,6 @@ import backend.const as const from process.models import Process from sitechecks.models import Inconsistency from unittest import mock -from testfixtures import LogCapture class MockHousekeeper: @@ -124,15 +123,15 @@ class TestCheckLDAPConsistency(ProcessFixtureMixin, TestCase): MockEntry("dd_u", supplementaryGid=["Debian"], cn="tcn", mn="tmn", sn="tsn", emailForward="test@example.org", accountStatus=None) ] - with LogCapture() as lc: + with self.assertLogs() as log: self.hk.run(CheckLDAPConsistency) - lc.check( - ("dsa.housekeeping", "INFO", "None: dd_u changing email_ldap from dd_u@example.org to test@example.org" - " (source: LDAP)"), - ('dsa.housekeeping', 'INFO', 'None: dd_u changing cn from Dd_u to tcn (source: LDAP)'), - ('dsa.housekeeping', 'INFO', 'None: dd_u changing mn from to tmn (source: LDAP)'), - ('dsa.housekeeping', 'INFO', 'None: dd_u changing sn from to tsn (source: LDAP)'), - ) + self.assertEqual(log.output, [ + "INFO:dsa.housekeeping:test.CheckLDAPConsistency: dd_u changing email_ldap from dd_u@example.org" + " to test@example.org (source: LDAP)", + 'INFO:dsa.housekeeping:test.CheckLDAPConsistency: dd_u changing cn from Dd_u to tcn (source: LDAP)', + 'INFO:dsa.housekeeping:test.CheckLDAPConsistency: dd_u changing mn from to tmn (source: LDAP)', + 'INFO:dsa.housekeeping:test.CheckLDAPConsistency: dd_u changing sn from to tsn (source: LDAP)', + ]) p = self.persons.dd_u p.refresh_from_db() diff --git a/test-instance/deploy.yml b/test-instance/deploy.yml index bef5f9a304f9dc037b5506104b69d7ba5a9769b2..74f5476c0e67df5b2e52045fee60ce7b095f8932 100644 --- a/test-instance/deploy.yml +++ b/test-instance/deploy.yml @@ -48,7 +48,6 @@ - gnupg - debian-keyring - python3-git - - python3-testfixtures - libjs-bootstrap4 - fonts-fork-awesome - libjs-jquery-datatables