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/rest | |
| 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/rest')
| -rw-r--r-- | src/mailman/rest/docs/systemconf.rst | 1 | ||||
| -rw-r--r-- | src/mailman/rest/tests/test_systemconf.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/mailman/rest/docs/systemconf.rst b/src/mailman/rest/docs/systemconf.rst index 8f7144d97..e61dd2cc9 100644 --- a/src/mailman/rest/docs/systemconf.rst +++ b/src/mailman/rest/docs/systemconf.rst @@ -30,6 +30,7 @@ You can also get all the values for a particular section, such as the ...or the ``[dmarc]`` section (or any other). >>> dump_json('http://localhost:9001/3.0/system/configuration/dmarc') + cache_lifetime: 7d http_etag: ... org_domain_data_url: https://publicsuffix.org/list/public_suffix_list.dat resolver_lifetime: 5s diff --git a/src/mailman/rest/tests/test_systemconf.py b/src/mailman/rest/tests/test_systemconf.py index 9801badf0..480af4e3b 100644 --- a/src/mailman/rest/tests/test_systemconf.py +++ b/src/mailman/rest/tests/test_systemconf.py @@ -59,6 +59,7 @@ class TestSystemConfiguration(unittest.TestCase): self.assertIn('http_etag', json) del json['http_etag'] self.assertEqual(json, dict( + cache_lifetime='7d', org_domain_data_url= # noqa: E251 'https://publicsuffix.org/list/public_suffix_list.dat', resolver_lifetime='5s', |