diff options
| author | Mark Sapiro | 2017-01-01 22:05:49 -0800 |
|---|---|---|
| committer | Mark Sapiro | 2017-01-01 22:05:49 -0800 |
| commit | f9cf79290eb7a22c4d52622dbef50367a086234d (patch) | |
| tree | 398ac7db49d11e3c11b15283da09edb1ab4fe661 /src/mailman/testing/helpers.py | |
| parent | d233dd419fabd4b42d5b83b920ec7ee54fee57da (diff) | |
| parent | e3d6c34b7d02b925cb8c59fa9e1df24741fc46ee (diff) | |
| download | mailman-f9cf79290eb7a22c4d52622dbef50367a086234d.tar.gz mailman-f9cf79290eb7a22c4d52622dbef50367a086234d.tar.zst mailman-f9cf79290eb7a22c4d52622dbef50367a086234d.zip | |
Merge branch 'mr215-review' of gitlab.com:warsaw/mailman into dmarc and
resolve conflicts.
Diffstat (limited to 'src/mailman/testing/helpers.py')
| -rw-r--r-- | src/mailman/testing/helpers.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mailman/testing/helpers.py b/src/mailman/testing/helpers.py index 233b03cf8..290f7e026 100644 --- a/src/mailman/testing/helpers.py +++ b/src/mailman/testing/helpers.py @@ -245,7 +245,7 @@ def get_nntp_server(cleanups): """ patcher = mock.patch('nntplib.NNTP') server_class = patcher.start() - cleanups.append(patcher.stop) + cleanups.callback(patcher.stop) nntpd = server_class() # A class for more convenient access to the posted message. class NNTPProxy: # noqa: E306 @@ -480,6 +480,11 @@ def reset_the_world(): getUtility(IStyleManager).populate() # Remove all dynamic header-match rules. config.chains['header-match'].flush() + # Remove cached organizational domain suffix file. + from mailman.rules.dmarc import LOCAL_FILE_NAME + suffix_file = os.path.join(config.VAR_DIR, LOCAL_FILE_NAME) + with suppress(FileNotFoundError): + os.remove(suffix_file) @public |