diff --git a/src/postorius/tests/fixtures/vcr_cassettes/archival_options.yaml b/src/postorius/tests/fixtures/vcr_cassettes/archival_options.yaml index d4982a2..4194c79 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/archival_options.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/archival_options.yaml @@ -3,35 +3,20 @@ body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -46,8 +31,8 @@ body: fqdn_listname=test_list%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -59,7 +44,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/test_list.example.com response: body: {string: !!python/unicode '{"display_name": "Test_list", "fqdn_listname": @@ -75,7 +60,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/test_list.example.com/archivers response: body: {string: !!python/unicode '{"http_etag": "\"3dbbbaad592a043938314db0e5249a1ca71d0dc6\"", @@ -88,7 +73,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/test_list.example.com response: body: {string: !!python/unicode '{"display_name": "Test_list", "fqdn_listname": @@ -104,11 +89,22 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/test_list@example.com response: body: {string: !!python/unicode ''} headers: content-length: ['0'] status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} version: 1 diff --git a/src/postorius/tests/fixtures/vcr_cassettes/list_members_access.yaml b/src/postorius/tests/fixtures/vcr_cassettes/list_members_access.yaml index 6f312cc..fb4cea7 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/list_members_access.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/list_members_access.yaml @@ -3,35 +3,20 @@ body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -46,8 +31,8 @@ body: fqdn_listname=foo%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -59,7 +44,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -74,33 +59,33 @@ body: list_id=foo.example.com&role=owner&subscriber=owner%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/9'] + location: ['http://localhost:9001/3.0/members/1977'] status: {code: 201, message: Created} - request: body: list_id=foo.example.com&role=moderator&subscriber=moderator%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/10'] + location: ['http://localhost:9001/3.0/members/1978'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode ''} @@ -108,38 +93,34 @@ content-length: ['0'] status: {code: 204, message: No Content} - request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -154,8 +135,8 @@ body: fqdn_listname=foo%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -167,7 +148,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -182,33 +163,33 @@ body: list_id=foo.example.com&role=owner&subscriber=owner%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/11'] + location: ['http://localhost:9001/3.0/members/1979'] status: {code: 201, message: Created} - request: body: list_id=foo.example.com&role=moderator&subscriber=moderator%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/12'] + location: ['http://localhost:9001/3.0/members/1980'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode ''} @@ -216,38 +197,34 @@ content-length: ['0'] status: {code: 204, message: No Content} - request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -262,8 +239,8 @@ body: fqdn_listname=foo%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -275,7 +252,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -290,33 +267,33 @@ body: list_id=foo.example.com&role=owner&subscriber=owner%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/13'] + location: ['http://localhost:9001/3.0/members/1981'] status: {code: 201, message: Created} - request: body: list_id=foo.example.com&role=moderator&subscriber=moderator%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/14'] + location: ['http://localhost:9001/3.0/members/1982'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode ''} @@ -324,38 +301,34 @@ content-length: ['0'] status: {code: 204, message: No Content} - request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -370,8 +343,8 @@ body: fqdn_listname=foo%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -383,7 +356,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -398,33 +371,33 @@ body: list_id=foo.example.com&role=owner&subscriber=owner%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/15'] + location: ['http://localhost:9001/3.0/members/1983'] status: {code: 201, message: Created} - request: body: list_id=foo.example.com&role=moderator&subscriber=moderator%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/16'] + location: ['http://localhost:9001/3.0/members/1984'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -439,10 +412,10 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/test@example.com response: - body: {string: !!python/unicode '404 Not Found'} + body: {string: !!python/unicode 404 Not Found} headers: content-length: ['13'] content-type: [application/json; charset=utf-8] @@ -451,42 +424,42 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/owner@example.com", - "delivery_mode": "regular", "email": "owner@example.com", "http_etag": "\"4836d2dd1f4a635e0c2c68676401e7aac4b041d2\"", - "list_id": "foo.example.com", "member_id": 15, "moderation_action": "accept", - "role": "owner", "self_link": "http://localhost:9001/3.0/members/15", "user": - "http://localhost:9001/3.0/users/5"}], "http_etag": "\"7fda7ca54850aa6bcc32a857e05f1b67f4fd112c\"", + "delivery_mode": "regular", "email": "owner@example.com", "http_etag": "\"ad525091b086f56673bff9802d8c37d879b1941c\"", + "list_id": "foo.example.com", "member_id": 1983, "moderation_action": "accept", + "role": "owner", "self_link": "http://localhost:9001/3.0/members/1983", "user": + "http://localhost:9001/3.0/users/1289"}], "http_etag": "\"b63fa5761ed4930d3c9d95b4ad8dad7fb350ea27\"", "start": 0, "total_size": 1}'} headers: - content-length: ['485'] + content-length: ['492'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/moderator response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/moderator@example.com", "delivery_mode": "regular", "email": "moderator@example.com", "http_etag": - "\"e37384d6114ae66b8992af01f6cdac80a8a1518d\"", "list_id": "foo.example.com", - "member_id": 16, "moderation_action": "accept", "role": "moderator", "self_link": - "http://localhost:9001/3.0/members/16", "user": "http://localhost:9001/3.0/users/6"}], - "http_etag": "\"05883ee672508b5b66a3270c4c9f215e08d264b2\"", "start": 0, "total_size": + "\"15e0a7c4270fe3e3a5a926c6be6298c0015a8f11\"", "list_id": "foo.example.com", + "member_id": 1984, "moderation_action": "accept", "role": "moderator", "self_link": + "http://localhost:9001/3.0/members/1984", "user": "http://localhost:9001/3.0/users/1290"}], + "http_etag": "\"9ef9bace3aeb28c45bf86e6e9963dd4680d0211d\"", "start": 0, "total_size": 1}'} headers: - content-length: ['497'] + content-length: ['504'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode ''} @@ -494,38 +467,34 @@ content-length: ['0'] status: {code: 204, message: No Content} - request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -540,8 +509,8 @@ body: fqdn_listname=foo%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -553,7 +522,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -568,37 +537,48 @@ body: list_id=foo.example.com&role=owner&subscriber=owner%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/17'] + location: ['http://localhost:9001/3.0/members/1985'] status: {code: 201, message: Created} - request: body: list_id=foo.example.com&role=moderator&subscriber=moderator%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/18'] + location: ['http://localhost:9001/3.0/members/1986'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode ''} headers: content-length: ['0'] status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} version: 1 diff --git a/src/postorius/tests/fixtures/vcr_cassettes/list_members_page.yaml b/src/postorius/tests/fixtures/vcr_cassettes/list_members_page.yaml index 1011093..66d2cc9 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/list_members_page.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/list_members_page.yaml @@ -3,7 +3,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -18,73 +18,73 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/moderator@example.com response: body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag": - "\"b774d488fd2356b7bedf0e6fa4a26dc70dc2b02b\"", "is_server_owner": false, - "self_link": "http://localhost:9001/3.0/users/6", "user_id": 6}'} + "\"1bc854b35b090c5f74b51f8d83f071df284919d4\"", "is_server_owner": false, + "self_link": "http://localhost:9001/3.0/users/1290", "user_id": 1290}'} headers: - content-length: ['188'] + content-length: ['194'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/users/6/addresses + method: !!python/unicode GET + uri: http://localhost:9001/3.0/users/1290/addresses response: body: {string: !!python/unicode '{"entries": [{"email": "moderator@example.com", - "http_etag": "\"ec747dd7d53c1dc2e3dac5df82b3757518dc89d1\"", "original_email": + "http_etag": "\"dd97059e72adac8e8bcb22da02c663fec01dee51\"", "original_email": "moderator@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": - "http://localhost:9001/3.0/addresses/moderator@example.com", "user": "http://localhost:9001/3.0/users/6"}], - "http_etag": "\"e912c0fa7b456f2f4b6f1841ae6d573072b49f2b\"", "start": 0, "total_size": + "http://localhost:9001/3.0/addresses/moderator@example.com", "user": "http://localhost:9001/3.0/users/1290"}], + "http_etag": "\"1f91c9b7e38ab71ab9b27770e9a8e2fe04a52e81\"", "start": 0, "total_size": 1}'} headers: - content-length: ['402'] + content-length: ['405'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/owner@example.com", - "delivery_mode": "regular", "email": "owner@example.com", "http_etag": "\"e954ac08bd224de03551765da8c594b25fa78a14\"", - "list_id": "foo.example.com", "member_id": 9, "moderation_action": "accept", - "role": "owner", "self_link": "http://localhost:9001/3.0/members/9", "user": - "http://localhost:9001/3.0/users/5"}], "http_etag": "\"421b1403f5702076a932c6e83cc5e6ee9dd3d2c1\"", + "delivery_mode": "regular", "email": "owner@example.com", "http_etag": "\"9d28f49e169da4032fec1c2987fca8946478845b\"", + "list_id": "foo.example.com", "member_id": 1977, "moderation_action": "accept", + "role": "owner", "self_link": "http://localhost:9001/3.0/members/1977", "user": + "http://localhost:9001/3.0/users/1289"}], "http_etag": "\"a48360f68608f28e096e92f4b4585b8367027ef4\"", "start": 0, "total_size": 1}'} headers: - content-length: ['483'] + content-length: ['492'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/moderator response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/moderator@example.com", "delivery_mode": "regular", "email": "moderator@example.com", "http_etag": - "\"f24c248b914be898eca0cc45afd0e46da0e43538\"", "list_id": "foo.example.com", - "member_id": 10, "moderation_action": "accept", "role": "moderator", "self_link": - "http://localhost:9001/3.0/members/10", "user": "http://localhost:9001/3.0/users/6"}], - "http_etag": "\"88546319f2cb2dcbb4e7532df77e7210870be9fb\"", "start": 0, "total_size": + "\"637299566c287eed1f926d2906b43624cbd4001d\"", "list_id": "foo.example.com", + "member_id": 1978, "moderation_action": "accept", "role": "moderator", "self_link": + "http://localhost:9001/3.0/members/1978", "user": "http://localhost:9001/3.0/users/1290"}], + "http_etag": "\"6b2f0bff7f14b6c961e68b8bce2836153191f4e9\"", "start": 0, "total_size": 1}'} headers: - content-length: ['497'] + content-length: ['504'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -99,72 +99,72 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/owner@example.com response: body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag": - "\"637c12d15eb0203c9ffac9ea2d5ac8605d18e38d\"", "is_server_owner": false, - "self_link": "http://localhost:9001/3.0/users/5", "user_id": 5}'} + "\"0695cfe16d46b9083370652e1bd5e081b06f90a6\"", "is_server_owner": false, + "self_link": "http://localhost:9001/3.0/users/1289", "user_id": 1289}'} headers: - content-length: ['188'] + content-length: ['194'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/users/5/addresses + method: !!python/unicode GET + uri: http://localhost:9001/3.0/users/1289/addresses response: body: {string: !!python/unicode '{"entries": [{"email": "owner@example.com", "http_etag": - "\"d69637140095e2552943e259d5cfb5258b3acafa\"", "original_email": "owner@example.com", + "\"59c3090fdd985ca9dfbaca5160b3c3b864b6fe1f\"", "original_email": "owner@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/owner@example.com", - "user": "http://localhost:9001/3.0/users/5"}], "http_etag": "\"abd6991d7cfc1ad5563ad5020a42c2ec5b88538a\"", + "user": "http://localhost:9001/3.0/users/1289"}], "http_etag": "\"68f10da4e6399f5769a809043cffd6a185fc69c8\"", "start": 0, "total_size": 1}'} headers: - content-length: ['390'] + content-length: ['393'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/owner@example.com", - "delivery_mode": "regular", "email": "owner@example.com", "http_etag": "\"e74d02cc776fe0401b0e48c1125fe629dda8604c\"", - "list_id": "foo.example.com", "member_id": 11, "moderation_action": "accept", - "role": "owner", "self_link": "http://localhost:9001/3.0/members/11", "user": - "http://localhost:9001/3.0/users/5"}], "http_etag": "\"50c7343675aeac50c12505149b2c35c323664c7e\"", + "delivery_mode": "regular", "email": "owner@example.com", "http_etag": "\"b332f2a7120abaad83048e727a651d4c70cffd64\"", + "list_id": "foo.example.com", "member_id": 1979, "moderation_action": "accept", + "role": "owner", "self_link": "http://localhost:9001/3.0/members/1979", "user": + "http://localhost:9001/3.0/users/1289"}], "http_etag": "\"c5486b9e5faf2601db6c6414d5cde582813284ea\"", "start": 0, "total_size": 1}'} headers: - content-length: ['485'] + content-length: ['492'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/moderator response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/moderator@example.com", "delivery_mode": "regular", "email": "moderator@example.com", "http_etag": - "\"aed24da483570207355c924912d06b4d7f66d457\"", "list_id": "foo.example.com", - "member_id": 12, "moderation_action": "accept", "role": "moderator", "self_link": - "http://localhost:9001/3.0/members/12", "user": "http://localhost:9001/3.0/users/6"}], - "http_etag": "\"81087c4d1e54a5c52dcb6c26870d9d851ab73c1f\"", "start": 0, "total_size": + "\"8081267514cd85cc6e426cf3a9ecebdf34b3378d\"", "list_id": "foo.example.com", + "member_id": 1980, "moderation_action": "accept", "role": "moderator", "self_link": + "http://localhost:9001/3.0/members/1980", "user": "http://localhost:9001/3.0/users/1290"}], + "http_etag": "\"c469e96b9c8da0966fc5a86ec737335bd25be9bb\"", "start": 0, "total_size": 1}'} headers: - content-length: ['497'] + content-length: ['504'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -179,7 +179,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com/roster/member?count=1&page=1 response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -192,7 +192,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com/roster/member?count=25&page=1 response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -205,7 +205,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -220,7 +220,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com/roster/member?count=1&page=1 response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -233,7 +233,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com/roster/member?count=25&page=1 response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_change_subscription-2.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_change_subscription-2.yaml index 9ad59cf..edb7297 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_change_subscription-2.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_change_subscription-2.yaml @@ -3,7 +3,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -18,12 +18,12 @@ body: display_name=None&list_id=foo.example.com&subscriber=test%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: - body: {string: !!python/unicode '{"http_etag": "\"5ef4b8c02a16638dd9a0b137836fc2e28cfcebce\"", - "token": "ba628db5bfe76e0c13963cecc062cf6ac1a9f89e", "token_owner": "subscriber"}'} + body: {string: !!python/unicode '{"http_etag": "\"c4204dbe9a99ca7d3a7c60421e77df4c4677a708\"", + "token": "31b4a4c7cc943225b231dc2d48e08ed5d513a653", "token_owner": "subscriber"}'} headers: content-length: ['143'] content-type: [application/json; charset=utf-8] @@ -32,23 +32,23 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/test@example.com response: body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "display_name": - "None", "http_etag": "\"738b16aa5f336bcbf244014d98535f24da52fc42\"", "is_server_owner": - false, "self_link": "http://localhost:9001/3.0/users/19", "user_id": 19}'} + "None", "http_etag": "\"634a6cd7b39bfae9ec2f1b738564a17505b55cf9\"", "is_server_owner": + false, "self_link": "http://localhost:9001/3.0/users/1301", "user_id": 1301}'} headers: - content-length: ['214'] + content-length: ['218'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: email=anotheremail%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' - uri: http://localhost:9001/3.0/users/19/addresses + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/users/1301/addresses response: body: {string: !!python/unicode ''} headers: @@ -59,7 +59,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'POST' + method: !!python/unicode POST uri: http://localhost:9001/3.0/addresses/anotheremail@example.com/verify response: body: {string: !!python/unicode ''} @@ -70,7 +70,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -85,41 +85,41 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/test@example.com response: body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "display_name": - "None", "http_etag": "\"738b16aa5f336bcbf244014d98535f24da52fc42\"", "is_server_owner": - false, "self_link": "http://localhost:9001/3.0/users/19", "user_id": 19}'} + "None", "http_etag": "\"634a6cd7b39bfae9ec2f1b738564a17505b55cf9\"", "is_server_owner": + false, "self_link": "http://localhost:9001/3.0/users/1301", "user_id": 1301}'} headers: - content-length: ['214'] + content-length: ['218'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/users/19/addresses + method: !!python/unicode GET + uri: http://localhost:9001/3.0/users/1301/addresses response: body: {string: !!python/unicode '{"entries": [{"email": "anotheremail@example.com", - "http_etag": "\"f9869a7a3dd79521370b25fccfc997d4d91b122d\"", "original_email": + "http_etag": "\"3d50c3f184000579d08c79e79d70cbfd1b5575b2\"", "original_email": "anotheremail@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": - "http://localhost:9001/3.0/addresses/anotheremail@example.com", "user": "http://localhost:9001/3.0/users/19", + "http://localhost:9001/3.0/addresses/anotheremail@example.com", "user": "http://localhost:9001/3.0/users/1301", "verified_on": "2005-08-01T07:49:23"}, {"display_name": "None", "email": "test@example.com", - "http_etag": "\"7e8d41ee53a45beef7f77b7a5209c25bce352646\"", "original_email": + "http_etag": "\"44a5592fc5c09a33bd1dc47f44700abe6ad05624\"", "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/test@example.com", - "user": "http://localhost:9001/3.0/users/19"}], "http_etag": "\"97fe2a96993cf0de972b05c6978383aa66226700\"", + "user": "http://localhost:9001/3.0/users/1301"}], "http_etag": "\"d0a5075374f77035b305dbc765360edc95112305\"", "start": 0, "total_size": 2}'} headers: - content-length: ['759'] + content-length: ['763'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -132,7 +132,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/moderator response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -145,7 +145,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/member/test@example.com response: body: {string: !!python/unicode '{}'} @@ -157,7 +157,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/member/anotheremail@example.com response: body: {string: !!python/unicode '{}'} @@ -169,7 +169,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_change_subscription.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_change_subscription.yaml index 4d20aae..73374ee 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_change_subscription.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_change_subscription.yaml @@ -3,7 +3,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -18,20 +18,20 @@ body: display_name=None&list_id=foo.example.com&pre_confirmed=True&pre_verified=True&subscriber=test%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/21'] + location: ['http://localhost:9001/3.0/members/1998'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -46,39 +46,39 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/test@example.com response: body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "display_name": - "None", "http_etag": "\"190a72468798ef5f7c51a5e73125abc76e61824a\"", "is_server_owner": - false, "self_link": "http://localhost:9001/3.0/users/12", "user_id": 12}'} + "None", "http_etag": "\"364d24378962e6605727378714933f5621bf78bf\"", "is_server_owner": + false, "self_link": "http://localhost:9001/3.0/users/1294", "user_id": 1294}'} headers: - content-length: ['214'] + content-length: ['218'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/users/12/addresses + method: !!python/unicode GET + uri: http://localhost:9001/3.0/users/1294/addresses response: body: {string: !!python/unicode '{"entries": [{"display_name": "None", "email": - "test@example.com", "http_etag": "\"a12067f833c53eafe6bfb670bdb75d061a0230c1\"", + "test@example.com", "http_etag": "\"cf7cbe211826558a261c282e5e061e6b90c02ef2\"", "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user": - "http://localhost:9001/3.0/users/12", "verified_on": "2005-08-01T07:49:23"}], - "http_etag": "\"4edf5c0f5e1d4d798c3afdec307cb7dbc4b00004\"", "start": 0, "total_size": + "http://localhost:9001/3.0/users/1294", "verified_on": "2005-08-01T07:49:23"}], + "http_etag": "\"df6aba510d8b0197cfc51d6fe8f596f767b3af77\"", "start": 0, "total_size": 1}'} headers: - content-length: ['450'] + content-length: ['452'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -91,7 +91,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/moderator response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -104,23 +104,23 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/member/test@example.com response: body: {string: !!python/unicode '{"address": "http://localhost:9001/3.0/addresses/test@example.com", - "delivery_mode": "regular", "email": "test@example.com", "http_etag": "\"c5d2eb41988c240c5e719310f06acc380eab3b13\"", - "list_id": "foo.example.com", "member_id": 21, "moderation_action": "defer", - "role": "member", "self_link": "http://localhost:9001/3.0/members/21", "user": - "http://localhost:9001/3.0/users/12"}'} + "delivery_mode": "regular", "email": "test@example.com", "http_etag": "\"40d48fd263ad7fdf3dc6b910f0a9cfc9ca0c9cb2\"", + "list_id": "foo.example.com", "member_id": 1998, "moderation_action": "defer", + "role": "member", "self_link": "http://localhost:9001/3.0/members/1998", "user": + "http://localhost:9001/3.0/users/1294"}'} headers: - content-length: ['379'] + content-length: ['385'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_domain_index.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_domain_index.yaml new file mode 100644 index 0000000..0e40f36 --- /dev/null +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_domain_index.yaml @@ -0,0 +1,553 @@ +interactions: +- request: + body: mail_host=example.com + headers: + accept-encoding: ['gzip, deflate'] + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/domains + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode GET + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode '{"base_url": "http://example.com", "description": + null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": + "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", + "url_host": "example.com"}'} + headers: + content-length: ['233'] + content-type: [application/json; charset=utf-8] + status: {code: 200, message: OK} +- request: + body: fqdn_listname=foo%40example.com + headers: + accept-encoding: ['gzip, deflate'] + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/lists + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + location: ['http://localhost:9001/3.0/lists/foo.example.com'] + status: {code: 201, message: Created} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode GET + uri: http://localhost:9001/3.0/lists/foo.example.com + response: + body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", + "http_etag": "\"698a819bbb6b902096a8c5543cc7fac2328960d5\"", "list_id": "foo.example.com", + "list_name": "foo", "mail_host": "example.com", "member_count": 0, "self_link": + "http://localhost:9001/3.0/lists/foo.example.com", "volume": 1}'} + headers: + content-length: ['294'] + content-type: [application/json; charset=utf-8] + status: {code: 200, message: OK} +- request: + body: list_id=foo.example.com&role=owner&subscriber=owner%40example.com + headers: + accept-encoding: ['gzip, deflate'] + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/members + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + location: ['http://localhost:9001/3.0/members/1988'] + status: {code: 201, message: Created} +- request: + body: list_id=foo.example.com&role=moderator&subscriber=moderator%40example.com + headers: + accept-encoding: ['gzip, deflate'] + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/members + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + location: ['http://localhost:9001/3.0/members/1989'] + status: {code: 201, message: Created} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode GET + uri: http://localhost:9001/3.0/domains + response: + body: {string: !!python/unicode '{"entries": [{"base_url": "http://example.com", + "description": null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", + "mail_host": "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", + "url_host": "example.com"}], "http_etag": "\"c385b155f8da284bf78dbe075e20f58a30c893ab\"", + "start": 0, "total_size": 1}'} + headers: + content-length: ['338'] + content-type: [application/json; charset=utf-8] + status: {code: 200, message: OK} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode GET + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode '{"base_url": "http://example.com", "description": + null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": + "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", + "url_host": "example.com"}'} + headers: + content-length: ['233'] + content-type: [application/json; charset=utf-8] + status: {code: 200, message: OK} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/lists/foo@example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: mail_host=example.com + headers: + accept-encoding: ['gzip, deflate'] + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/domains + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode GET + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode '{"base_url": "http://example.com", "description": + null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": + "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", + "url_host": "example.com"}'} + headers: + content-length: ['233'] + content-type: [application/json; charset=utf-8] + status: {code: 200, message: OK} +- request: + body: fqdn_listname=foo%40example.com + headers: + accept-encoding: ['gzip, deflate'] + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/lists + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + location: ['http://localhost:9001/3.0/lists/foo.example.com'] + status: {code: 201, message: Created} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode GET + uri: http://localhost:9001/3.0/lists/foo.example.com + response: + body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", + "http_etag": "\"698a819bbb6b902096a8c5543cc7fac2328960d5\"", "list_id": "foo.example.com", + "list_name": "foo", "mail_host": "example.com", "member_count": 0, "self_link": + "http://localhost:9001/3.0/lists/foo.example.com", "volume": 1}'} + headers: + content-length: ['294'] + content-type: [application/json; charset=utf-8] + status: {code: 200, message: OK} +- request: + body: list_id=foo.example.com&role=owner&subscriber=owner%40example.com + headers: + accept-encoding: ['gzip, deflate'] + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/members + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + location: ['http://localhost:9001/3.0/members/1990'] + status: {code: 201, message: Created} +- request: + body: list_id=foo.example.com&role=moderator&subscriber=moderator%40example.com + headers: + accept-encoding: ['gzip, deflate'] + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/members + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + location: ['http://localhost:9001/3.0/members/1991'] + status: {code: 201, message: Created} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/lists/foo@example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: mail_host=example.com + headers: + accept-encoding: ['gzip, deflate'] + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/domains + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode GET + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode '{"base_url": "http://example.com", "description": + null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": + "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", + "url_host": "example.com"}'} + headers: + content-length: ['233'] + content-type: [application/json; charset=utf-8] + status: {code: 200, message: OK} +- request: + body: fqdn_listname=foo%40example.com + headers: + accept-encoding: ['gzip, deflate'] + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/lists + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + location: ['http://localhost:9001/3.0/lists/foo.example.com'] + status: {code: 201, message: Created} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode GET + uri: http://localhost:9001/3.0/lists/foo.example.com + response: + body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", + "http_etag": "\"698a819bbb6b902096a8c5543cc7fac2328960d5\"", "list_id": "foo.example.com", + "list_name": "foo", "mail_host": "example.com", "member_count": 0, "self_link": + "http://localhost:9001/3.0/lists/foo.example.com", "volume": 1}'} + headers: + content-length: ['294'] + content-type: [application/json; charset=utf-8] + status: {code: 200, message: OK} +- request: + body: list_id=foo.example.com&role=owner&subscriber=owner%40example.com + headers: + accept-encoding: ['gzip, deflate'] + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/members + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + location: ['http://localhost:9001/3.0/members/1992'] + status: {code: 201, message: Created} +- request: + body: list_id=foo.example.com&role=moderator&subscriber=moderator%40example.com + headers: + accept-encoding: ['gzip, deflate'] + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/members + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + location: ['http://localhost:9001/3.0/members/1993'] + status: {code: 201, message: Created} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/lists/foo@example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: mail_host=example.com + headers: + accept-encoding: ['gzip, deflate'] + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/domains + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode GET + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode '{"base_url": "http://example.com", "description": + null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": + "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", + "url_host": "example.com"}'} + headers: + content-length: ['233'] + content-type: [application/json; charset=utf-8] + status: {code: 200, message: OK} +- request: + body: fqdn_listname=foo%40example.com + headers: + accept-encoding: ['gzip, deflate'] + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/lists + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + location: ['http://localhost:9001/3.0/lists/foo.example.com'] + status: {code: 201, message: Created} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode GET + uri: http://localhost:9001/3.0/lists/foo.example.com + response: + body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", + "http_etag": "\"698a819bbb6b902096a8c5543cc7fac2328960d5\"", "list_id": "foo.example.com", + "list_name": "foo", "mail_host": "example.com", "member_count": 0, "self_link": + "http://localhost:9001/3.0/lists/foo.example.com", "volume": 1}'} + headers: + content-length: ['294'] + content-type: [application/json; charset=utf-8] + status: {code: 200, message: OK} +- request: + body: list_id=foo.example.com&role=owner&subscriber=owner%40example.com + headers: + accept-encoding: ['gzip, deflate'] + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/members + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + location: ['http://localhost:9001/3.0/members/1994'] + status: {code: 201, message: Created} +- request: + body: list_id=foo.example.com&role=moderator&subscriber=moderator%40example.com + headers: + accept-encoding: ['gzip, deflate'] + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/members + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + location: ['http://localhost:9001/3.0/members/1995'] + status: {code: 201, message: Created} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/lists/foo@example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: mail_host=example.com + headers: + accept-encoding: ['gzip, deflate'] + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/domains + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode GET + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode '{"base_url": "http://example.com", "description": + null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": + "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", + "url_host": "example.com"}'} + headers: + content-length: ['233'] + content-type: [application/json; charset=utf-8] + status: {code: 200, message: OK} +- request: + body: fqdn_listname=foo%40example.com + headers: + accept-encoding: ['gzip, deflate'] + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/lists + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + location: ['http://localhost:9001/3.0/lists/foo.example.com'] + status: {code: 201, message: Created} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode GET + uri: http://localhost:9001/3.0/lists/foo.example.com + response: + body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", + "http_etag": "\"698a819bbb6b902096a8c5543cc7fac2328960d5\"", "list_id": "foo.example.com", + "list_name": "foo", "mail_host": "example.com", "member_count": 0, "self_link": + "http://localhost:9001/3.0/lists/foo.example.com", "volume": 1}'} + headers: + content-length: ['294'] + content-type: [application/json; charset=utf-8] + status: {code: 200, message: OK} +- request: + body: list_id=foo.example.com&role=owner&subscriber=owner%40example.com + headers: + accept-encoding: ['gzip, deflate'] + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/members + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + location: ['http://localhost:9001/3.0/members/1996'] + status: {code: 201, message: Created} +- request: + body: list_id=foo.example.com&role=moderator&subscriber=moderator%40example.com + headers: + accept-encoding: ['gzip, deflate'] + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/members + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + location: ['http://localhost:9001/3.0/members/1997'] + status: {code: 201, message: Created} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/lists/foo@example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +version: 1 diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options.yaml index e155ac3..54cda4f 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options.yaml @@ -3,8 +3,8 @@ body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: body: {string: !!python/unicode ''} @@ -16,7 +16,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -31,8 +31,8 @@ body: fqdn_listname=test_list%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -44,7 +44,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/test_list.example.com response: body: {string: !!python/unicode '{"display_name": "Test_list", "fqdn_listname": @@ -60,7 +60,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/test_list.example.com/archivers response: body: {string: !!python/unicode '{"http_etag": "\"3dbbbaad592a043938314db0e5249a1ca71d0dc6\"", @@ -73,7 +73,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/test_list.example.com response: body: {string: !!python/unicode '{"display_name": "Test_list", "fqdn_listname": @@ -89,7 +89,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/test_list@example.com response: body: {string: !!python/unicode ''} @@ -97,38 +97,34 @@ content-length: ['0'] status: {code: 204, message: No Content} - request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -143,8 +139,8 @@ body: fqdn_listname=test_list%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -156,7 +152,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/test_list.example.com response: body: {string: !!python/unicode '{"display_name": "Test_list", "fqdn_listname": @@ -172,7 +168,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/test_list.example.com/archivers response: body: {string: !!python/unicode '{"http_etag": "\"3dbbbaad592a043938314db0e5249a1ca71d0dc6\"", @@ -185,7 +181,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/test_list.example.com response: body: {string: !!python/unicode '{"display_name": "Test_list", "fqdn_listname": @@ -201,7 +197,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/test_list@example.com response: body: {string: !!python/unicode ''} @@ -209,38 +205,34 @@ content-length: ['0'] status: {code: 204, message: No Content} - request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -255,8 +247,8 @@ body: fqdn_listname=test_list%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -268,7 +260,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/test_list.example.com response: body: {string: !!python/unicode '{"display_name": "Test_list", "fqdn_listname": @@ -284,7 +276,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/test_list.example.com/archivers response: body: {string: !!python/unicode '{"http_etag": "\"3dbbbaad592a043938314db0e5249a1ca71d0dc6\"", @@ -297,11 +289,22 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/test_list@example.com response: body: {string: !!python/unicode ''} headers: content-length: ['0'] status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} version: 1 diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options_disable_archiver.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options_disable_archiver.yaml index 117e166..7c62e45 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options_disable_archiver.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options_disable_archiver.yaml @@ -3,7 +3,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/test_list.example.com response: body: {string: !!python/unicode '{"display_name": "Test_list", "fqdn_listname": @@ -19,7 +19,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/test_list.example.com/archivers response: body: {string: !!python/unicode '{"http_etag": "\"3dbbbaad592a043938314db0e5249a1ca71d0dc6\"", @@ -32,8 +32,8 @@ body: mail-archive=False headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'PATCH' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode PATCH uri: http://localhost:9001/3.0/lists/test_list.example.com/archivers response: body: {string: !!python/unicode ''} @@ -44,7 +44,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/test_list.example.com/archivers response: body: {string: !!python/unicode '{"http_etag": "\"9f3e82fa9d7dc70277565c9703a90ad3fbeb9a03\"", @@ -57,7 +57,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/test_list.example.com/archivers response: body: {string: !!python/unicode '{"http_etag": "\"9f3e82fa9d7dc70277565c9703a90ad3fbeb9a03\"", diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options_enable_archiver.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options_enable_archiver.yaml index da77cc8..daa8c4d 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options_enable_archiver.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_archival_options_enable_archiver.yaml @@ -3,7 +3,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/test_list.example.com response: body: {string: !!python/unicode '{"display_name": "Test_list", "fqdn_listname": @@ -19,7 +19,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/test_list.example.com/archivers response: body: {string: !!python/unicode '{"http_etag": "\"9f3e82fa9d7dc70277565c9703a90ad3fbeb9a03\"", @@ -32,8 +32,8 @@ body: mail-archive=True headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'PATCH' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode PATCH uri: http://localhost:9001/3.0/lists/test_list.example.com/archivers response: body: {string: !!python/unicode ''} @@ -44,7 +44,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/test_list.example.com/archivers response: body: {string: !!python/unicode '{"http_etag": "\"3dbbbaad592a043938314db0e5249a1ca71d0dc6\"", @@ -54,11 +54,11 @@ content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: - body: prototype=False + body: mhonarc=False headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'PATCH' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode PATCH uri: http://localhost:9001/3.0/lists/test_list.example.com/archivers response: body: {string: !!python/unicode ''} @@ -69,21 +69,21 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/test_list.example.com/archivers response: - body: {string: !!python/unicode '{"http_etag": "\"dfd159ec866aff2f484eb6399b59057ba112d3e5\"", - "mail-archive": true, "mhonarc": true, "prototype": false}'} + body: {string: !!python/unicode '{"http_etag": "\"936e46ad303ba96ba71e5dfcf266fc77f39c827f\"", + "mail-archive": true, "mhonarc": false, "prototype": true}'} headers: content-length: ['120'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: - body: mhonarc=False + body: prototype=False headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'PATCH' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode PATCH uri: http://localhost:9001/3.0/lists/test_list.example.com/archivers response: body: {string: !!python/unicode ''} @@ -94,7 +94,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/test_list.example.com/archivers response: body: {string: !!python/unicode '{"http_etag": "\"de68e13c430d856461d2b39a5b5d5286d91528bc\"", @@ -107,7 +107,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/test_list.example.com/archivers response: body: {string: !!python/unicode '{"http_etag": "\"de68e13c430d856461d2b39a5b5d5286d91528bc\"", diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_creation.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_creation.yaml index 549f36d..55e645d 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_creation.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_creation.yaml @@ -3,35 +3,20 @@ body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains response: body: {string: !!python/unicode '{"entries": [{"base_url": "http://example.com", @@ -47,7 +32,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -62,7 +47,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -77,7 +62,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -92,8 +77,8 @@ body: fqdn_listname=a_new_list%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -105,7 +90,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/a_new_list.example.com response: body: {string: !!python/unicode '{"display_name": "A_new_list", "fqdn_listname": @@ -121,20 +106,20 @@ body: list_id=a_new_list.example.com&role=owner&subscriber=owner%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/28'] + location: ['http://localhost:9001/3.0/members/1987'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/a_new_list@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": @@ -166,8 +151,8 @@ body: advertised=True&description=A+new+list. headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'PATCH' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode PATCH uri: http://localhost:9001/3.0/lists/a_new_list@example.com/config response: body: {string: !!python/unicode ''} @@ -178,7 +163,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/a_new_list@example.com response: body: {string: !!python/unicode '{"display_name": "A_new_list", "fqdn_listname": @@ -194,24 +179,24 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/a_new_list.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/owner@example.com", - "delivery_mode": "regular", "email": "owner@example.com", "http_etag": "\"72d2aa138349ab8e1c1903179832c80f59a76a1c\"", - "list_id": "a_new_list.example.com", "member_id": 28, "moderation_action": - "accept", "role": "owner", "self_link": "http://localhost:9001/3.0/members/28", - "user": "http://localhost:9001/3.0/users/21"}], "http_etag": "\"e3b6179faa2b6c2d1f1ba7e94b8431d08098e176\"", + "delivery_mode": "regular", "email": "owner@example.com", "http_etag": "\"e4efc799aecc73a9ba69ce64ee1205b72d7f1b2e\"", + "list_id": "a_new_list.example.com", "member_id": 1987, "moderation_action": + "accept", "role": "owner", "self_link": "http://localhost:9001/3.0/members/1987", + "user": "http://localhost:9001/3.0/users/1292"}], "http_etag": "\"3bf706296b8aff1443013d11fb583f63edb53226\"", "start": 0, "total_size": 1}'} headers: - content-length: ['493'] + content-length: ['499'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode '{"entries": [{"display_name": "A_new_list", "fqdn_listname": @@ -228,7 +213,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/a_new_list@example.com response: body: {string: !!python/unicode ''} @@ -236,38 +221,34 @@ content-length: ['0'] status: {code: 204, message: No Content} - request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -276,4 +257,142 @@ content-length: ['90'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: base_url=http%3A%2F%2Fexample.com&description=A+new+Domain.&mail_host=example.com&owner=su%40example.com + headers: + accept-encoding: ['gzip, deflate'] + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/domains + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode GET + uri: http://localhost:9001/3.0/domains + response: + body: {string: !!python/unicode '{"entries": [{"base_url": "http://example.com", + "description": "A new Domain.", "http_etag": "\"f574263235a622b271bd1115317117aee0e171f0\"", + "mail_host": "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", + "url_host": "example.com"}], "http_etag": "\"38f84ff58faee37a60c2f95a37be70303d2cfb59\"", + "start": 0, "total_size": 1}'} + headers: + content-length: ['349'] + content-type: [application/json; charset=utf-8] + status: {code: 200, message: OK} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode GET + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode '{"base_url": "http://example.com", "description": + "A new Domain.", "http_etag": "\"f574263235a622b271bd1115317117aee0e171f0\"", + "mail_host": "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", + "url_host": "example.com"}'} + headers: + content-length: ['244'] + content-type: [application/json; charset=utf-8] + status: {code: 200, message: OK} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode GET + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode '{"base_url": "http://example.com", "description": + "A new Domain.", "http_etag": "\"f574263235a622b271bd1115317117aee0e171f0\"", + "mail_host": "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", + "url_host": "example.com"}'} + headers: + content-length: ['244'] + content-type: [application/json; charset=utf-8] + status: {code: 200, message: OK} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode GET + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode '{"base_url": "http://example.com", "description": + "A new Domain.", "http_etag": "\"f574263235a622b271bd1115317117aee0e171f0\"", + "mail_host": "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", + "url_host": "example.com"}'} + headers: + content-length: ['244'] + content-type: [application/json; charset=utf-8] + status: {code: 200, message: OK} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode GET + uri: http://localhost:9001/3.0/domains/example.com/owners + response: + body: {string: !!python/unicode '{"entries": [{"created_on": "2005-08-01T07:49:23", + "http_etag": "\"90e1f8cc417b5558f52e802092b29c925634cb6b\"", "is_server_owner": + false, "self_link": "http://localhost:9001/3.0/users/1302", "user_id": 1302}], + "http_etag": "\"cdc8bcefd5c0b48ecad111c2f82220fb3d0b35cb\"", "start": 0, "total_size": + 1}'} + headers: + content-length: ['299'] + content-type: [application/json; charset=utf-8] + status: {code: 200, message: OK} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode GET + uri: http://localhost:9001/3.0/users/su@example.com + response: + body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag": + "\"90e1f8cc417b5558f52e802092b29c925634cb6b\"", "is_server_owner": false, + "self_link": "http://localhost:9001/3.0/users/1302", "user_id": 1302}'} + headers: + content-length: ['194'] + content-type: [application/json; charset=utf-8] + status: {code: 200, message: OK} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode 404 Not Found} + headers: + content-length: ['13'] + content-type: [application/json; charset=utf-8] + status: {code: 404, message: Not Found} version: 1 diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_index.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_index.yaml index 0242ada..7b6b770 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_index.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_index.yaml @@ -3,35 +3,20 @@ body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -46,8 +31,8 @@ body: fqdn_listname=foo%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -59,8 +44,8 @@ body: fqdn_listname=bar%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -72,7 +57,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode '{"entries": [{"display_name": "Foo", "fqdn_listname": @@ -93,7 +78,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": @@ -124,7 +109,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/bar@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": @@ -155,7 +140,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains response: body: {string: !!python/unicode '{"entries": [{"base_url": "http://example.com", @@ -171,7 +156,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -186,7 +171,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode '{"entries": [{"display_name": "Foo", "fqdn_listname": @@ -207,7 +192,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode ''} @@ -218,11 +203,22 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/bar@example.com response: body: {string: !!python/unicode ''} headers: content-length: ['0'] status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} version: 1 diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_add_moderator.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_add_moderator.yaml index 68a6c20..0533ffe 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_add_moderator.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_add_moderator.yaml @@ -3,35 +3,20 @@ body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -46,8 +31,8 @@ body: fqdn_listname=foo%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -59,7 +44,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -74,54 +59,54 @@ body: list_id=foo.example.com&role=moderator&subscriber=newmod%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/1'] + location: ['http://localhost:9001/3.0/members/1969'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/moderator response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/newmod@example.com", - "delivery_mode": "regular", "email": "newmod@example.com", "http_etag": "\"c8c71cc3e29d53d13e916dcb627e952627f1ca18\"", - "list_id": "foo.example.com", "member_id": 1, "moderation_action": "accept", - "role": "moderator", "self_link": "http://localhost:9001/3.0/members/1", "user": - "http://localhost:9001/3.0/users/1"}], "http_etag": "\"34e4cec6c6315ead2e60d99bf4c13485e3a09be9\"", + "delivery_mode": "regular", "email": "newmod@example.com", "http_etag": "\"88155c208a1322d908ee7ac6056fdce20900794e\"", + "list_id": "foo.example.com", "member_id": 1969, "moderation_action": "accept", + "role": "moderator", "self_link": "http://localhost:9001/3.0/members/1969", + "user": "http://localhost:9001/3.0/users/1285"}], "http_etag": "\"17e8f89d89c4c229253afe347fb842de685e24c6\"", "start": 0, "total_size": 1}'} headers: - content-length: ['489'] + content-length: ['498'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/moderator response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/newmod@example.com", - "delivery_mode": "regular", "email": "newmod@example.com", "http_etag": "\"c8c71cc3e29d53d13e916dcb627e952627f1ca18\"", - "list_id": "foo.example.com", "member_id": 1, "moderation_action": "accept", - "role": "moderator", "self_link": "http://localhost:9001/3.0/members/1", "user": - "http://localhost:9001/3.0/users/1"}], "http_etag": "\"34e4cec6c6315ead2e60d99bf4c13485e3a09be9\"", + "delivery_mode": "regular", "email": "newmod@example.com", "http_etag": "\"88155c208a1322d908ee7ac6056fdce20900794e\"", + "list_id": "foo.example.com", "member_id": 1969, "moderation_action": "accept", + "role": "moderator", "self_link": "http://localhost:9001/3.0/members/1969", + "user": "http://localhost:9001/3.0/users/1285"}], "http_etag": "\"17e8f89d89c4c229253afe347fb842de685e24c6\"", "start": 0, "total_size": 1}'} headers: - content-length: ['489'] + content-length: ['498'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -136,11 +121,22 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode ''} headers: content-length: ['0'] status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} version: 1 diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_new_moderator_added.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_new_moderator_added.yaml index 05abb9e..db202c6 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_new_moderator_added.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_new_moderator_added.yaml @@ -3,17 +3,17 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/moderator response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/newmod@example.com", - "delivery_mode": "regular", "email": "newmod@example.com", "http_etag": "\"c8c71cc3e29d53d13e916dcb627e952627f1ca18\"", - "list_id": "foo.example.com", "member_id": 1, "moderation_action": "accept", - "role": "moderator", "self_link": "http://localhost:9001/3.0/members/1", "user": - "http://localhost:9001/3.0/users/1"}], "http_etag": "\"34e4cec6c6315ead2e60d99bf4c13485e3a09be9\"", + "delivery_mode": "regular", "email": "newmod@example.com", "http_etag": "\"88155c208a1322d908ee7ac6056fdce20900794e\"", + "list_id": "foo.example.com", "member_id": 1969, "moderation_action": "accept", + "role": "moderator", "self_link": "http://localhost:9001/3.0/members/1969", + "user": "http://localhost:9001/3.0/users/1285"}], "http_etag": "\"17e8f89d89c4c229253afe347fb842de685e24c6\"", "start": 0, "total_size": 1}'} headers: - content-length: ['489'] + content-length: ['498'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} version: 1 diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner.yaml index 5b7588d..b0636bd 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner.yaml @@ -3,35 +3,20 @@ body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -46,8 +31,8 @@ body: fqdn_listname=foo%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -59,7 +44,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -74,20 +59,20 @@ body: list_id=foo.example.com&role=owner&subscriber=su%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/2'] + location: ['http://localhost:9001/3.0/members/1970'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -102,7 +87,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode ''} @@ -110,38 +95,34 @@ content-length: ['0'] status: {code: 204, message: No Content} - request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -156,8 +137,8 @@ body: fqdn_listname=foo%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -169,7 +150,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -184,20 +165,20 @@ body: list_id=foo.example.com&role=owner&subscriber=su%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/4'] + location: ['http://localhost:9001/3.0/members/1972'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -212,7 +193,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode ''} @@ -220,38 +201,34 @@ content-length: ['0'] status: {code: 204, message: No Content} - request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -266,8 +243,8 @@ body: fqdn_listname=foo%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -279,7 +256,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -294,20 +271,20 @@ body: list_id=foo.example.com&role=owner&subscriber=su%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/7'] + location: ['http://localhost:9001/3.0/members/1975'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -322,11 +299,22 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode ''} headers: content-length: ['0'] status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} version: 1 diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner_add_remove.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner_add_remove.yaml index de36a4a..b9ef3d4 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner_add_remove.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner_add_remove.yaml @@ -3,7 +3,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -18,64 +18,64 @@ body: list_id=foo.example.com&role=owner&subscriber=newowner%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/3'] + location: ['http://localhost:9001/3.0/members/1971'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/newowner@example.com", "delivery_mode": "regular", "email": "newowner@example.com", "http_etag": - "\"c360c4bc48bbbcee07c1671e1017747feba62e4c\"", "list_id": "foo.example.com", - "member_id": 3, "moderation_action": "accept", "role": "owner", "self_link": - "http://localhost:9001/3.0/members/3", "user": "http://localhost:9001/3.0/users/3"}, + "\"513c7d01147ef6fddf1c2d19cd20ccd2f9bdd0db\"", "list_id": "foo.example.com", + "member_id": 1971, "moderation_action": "accept", "role": "owner", "self_link": + "http://localhost:9001/3.0/members/1971", "user": "http://localhost:9001/3.0/users/1287"}, {"address": "http://localhost:9001/3.0/addresses/su@example.com", "delivery_mode": - "regular", "email": "su@example.com", "http_etag": "\"6d988707f754565f2549feb10fb8d43ba08b7fc0\"", - "list_id": "foo.example.com", "member_id": 2, "moderation_action": "accept", - "role": "owner", "self_link": "http://localhost:9001/3.0/members/2", "user": - "http://localhost:9001/3.0/users/2"}], "http_etag": "\"a22da6e895b3ece1bba80b58412640036aa3b856\"", + "regular", "email": "su@example.com", "http_etag": "\"c31af7c971c9c83870e8d3d3f7c89889e6e19fcb\"", + "list_id": "foo.example.com", "member_id": 1970, "moderation_action": "accept", + "role": "owner", "self_link": "http://localhost:9001/3.0/members/1970", "user": + "http://localhost:9001/3.0/users/1286"}], "http_etag": "\"08b611af5ade0a22ee45dbcbcc24b60cf347297b\"", "start": 0, "total_size": 2}'} headers: - content-length: ['863'] + content-length: ['881'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/newowner@example.com", "delivery_mode": "regular", "email": "newowner@example.com", "http_etag": - "\"c360c4bc48bbbcee07c1671e1017747feba62e4c\"", "list_id": "foo.example.com", - "member_id": 3, "moderation_action": "accept", "role": "owner", "self_link": - "http://localhost:9001/3.0/members/3", "user": "http://localhost:9001/3.0/users/3"}, + "\"513c7d01147ef6fddf1c2d19cd20ccd2f9bdd0db\"", "list_id": "foo.example.com", + "member_id": 1971, "moderation_action": "accept", "role": "owner", "self_link": + "http://localhost:9001/3.0/members/1971", "user": "http://localhost:9001/3.0/users/1287"}, {"address": "http://localhost:9001/3.0/addresses/su@example.com", "delivery_mode": - "regular", "email": "su@example.com", "http_etag": "\"6d988707f754565f2549feb10fb8d43ba08b7fc0\"", - "list_id": "foo.example.com", "member_id": 2, "moderation_action": "accept", - "role": "owner", "self_link": "http://localhost:9001/3.0/members/2", "user": - "http://localhost:9001/3.0/users/2"}], "http_etag": "\"a22da6e895b3ece1bba80b58412640036aa3b856\"", + "regular", "email": "su@example.com", "http_etag": "\"c31af7c971c9c83870e8d3d3f7c89889e6e19fcb\"", + "list_id": "foo.example.com", "member_id": 1970, "moderation_action": "accept", + "role": "owner", "self_link": "http://localhost:9001/3.0/members/1970", "user": + "http://localhost:9001/3.0/users/1286"}], "http_etag": "\"08b611af5ade0a22ee45dbcbcc24b60cf347297b\"", "start": 0, "total_size": 2}'} headers: - content-length: ['863'] + content-length: ['881'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -90,29 +90,29 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/newowner@example.com", "delivery_mode": "regular", "email": "newowner@example.com", "http_etag": - "\"c360c4bc48bbbcee07c1671e1017747feba62e4c\"", "list_id": "foo.example.com", - "member_id": 3, "moderation_action": "accept", "role": "owner", "self_link": - "http://localhost:9001/3.0/members/3", "user": "http://localhost:9001/3.0/users/3"}, + "\"513c7d01147ef6fddf1c2d19cd20ccd2f9bdd0db\"", "list_id": "foo.example.com", + "member_id": 1971, "moderation_action": "accept", "role": "owner", "self_link": + "http://localhost:9001/3.0/members/1971", "user": "http://localhost:9001/3.0/users/1287"}, {"address": "http://localhost:9001/3.0/addresses/su@example.com", "delivery_mode": - "regular", "email": "su@example.com", "http_etag": "\"6d988707f754565f2549feb10fb8d43ba08b7fc0\"", - "list_id": "foo.example.com", "member_id": 2, "moderation_action": "accept", - "role": "owner", "self_link": "http://localhost:9001/3.0/members/2", "user": - "http://localhost:9001/3.0/users/2"}], "http_etag": "\"a22da6e895b3ece1bba80b58412640036aa3b856\"", + "regular", "email": "su@example.com", "http_etag": "\"c31af7c971c9c83870e8d3d3f7c89889e6e19fcb\"", + "list_id": "foo.example.com", "member_id": 1970, "moderation_action": "accept", + "role": "owner", "self_link": "http://localhost:9001/3.0/members/1970", "user": + "http://localhost:9001/3.0/users/1286"}], "http_etag": "\"08b611af5ade0a22ee45dbcbcc24b60cf347297b\"", "start": 0, "total_size": 2}'} headers: - content-length: ['863'] + content-length: ['881'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com/owner/newowner@example.com response: body: {string: !!python/unicode ''} @@ -123,17 +123,17 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/su@example.com", - "delivery_mode": "regular", "email": "su@example.com", "http_etag": "\"6d988707f754565f2549feb10fb8d43ba08b7fc0\"", - "list_id": "foo.example.com", "member_id": 2, "moderation_action": "accept", - "role": "owner", "self_link": "http://localhost:9001/3.0/members/2", "user": - "http://localhost:9001/3.0/users/2"}], "http_etag": "\"d2cbb6fb6355e9524edc8e386f081c430375c54c\"", + "delivery_mode": "regular", "email": "su@example.com", "http_etag": "\"c31af7c971c9c83870e8d3d3f7c89889e6e19fcb\"", + "list_id": "foo.example.com", "member_id": 1970, "moderation_action": "accept", + "role": "owner", "self_link": "http://localhost:9001/3.0/members/1970", "user": + "http://localhost:9001/3.0/users/1286"}], "http_etag": "\"ceaad0fdd6047de716d23fc158c2dbcbb3ef7910\"", "start": 0, "total_size": 1}'} headers: - content-length: ['477'] + content-length: ['486'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} version: 1 diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner_by_owner.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner_by_owner.yaml index 4e9843c..57ddf69 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner_by_owner.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner_by_owner.yaml @@ -3,24 +3,24 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/su@example.com", - "delivery_mode": "regular", "email": "su@example.com", "http_etag": "\"41d57890ce496889a5e5228b4fe371df4c366828\"", - "list_id": "foo.example.com", "member_id": 7, "moderation_action": "accept", - "role": "owner", "self_link": "http://localhost:9001/3.0/members/7", "user": - "http://localhost:9001/3.0/users/2"}], "http_etag": "\"cad820684c756eb04bc8968d4f91288f13498e66\"", + "delivery_mode": "regular", "email": "su@example.com", "http_etag": "\"aa48f3a38b3aca7b79147cf59c18f45e72e7a324\"", + "list_id": "foo.example.com", "member_id": 1975, "moderation_action": "accept", + "role": "owner", "self_link": "http://localhost:9001/3.0/members/1975", "user": + "http://localhost:9001/3.0/users/1286"}], "http_etag": "\"5e208f7e1de4d90d63df65d4b7deb0de8b96ffd1\"", "start": 0, "total_size": 1}'} headers: - content-length: ['477'] + content-length: ['486'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -35,54 +35,54 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/su@example.com response: body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag": - "\"b36f8ca1d91d583901c768dc116815282d469c66\"", "is_server_owner": false, - "self_link": "http://localhost:9001/3.0/users/2", "user_id": 2}'} + "\"a3f0c3dc174b9c4fc253d4787d37de5df178d4c2\"", "is_server_owner": false, + "self_link": "http://localhost:9001/3.0/users/1286", "user_id": 1286}'} headers: - content-length: ['188'] + content-length: ['194'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/users/2/addresses + method: !!python/unicode GET + uri: http://localhost:9001/3.0/users/1286/addresses response: body: {string: !!python/unicode '{"entries": [{"email": "su@example.com", "http_etag": - "\"a8988d233ad4b9e8641ad5d75553912565efec83\"", "original_email": "su@example.com", + "\"9ac7d43d92b3c701fb5041d65a0f9fca6380b613\"", "original_email": "su@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/su@example.com", - "user": "http://localhost:9001/3.0/users/2"}], "http_etag": "\"7cc723891821fbf8b0974c2ec407cca11fbb6726\"", + "user": "http://localhost:9001/3.0/users/1286"}], "http_etag": "\"484dad2ec4bf3cd0102e524d3ebb4750f5054ed0\"", "start": 0, "total_size": 1}'} headers: - content-length: ['381'] + content-length: ['384'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/su@example.com", - "delivery_mode": "regular", "email": "su@example.com", "http_etag": "\"41d57890ce496889a5e5228b4fe371df4c366828\"", - "list_id": "foo.example.com", "member_id": 7, "moderation_action": "accept", - "role": "owner", "self_link": "http://localhost:9001/3.0/members/7", "user": - "http://localhost:9001/3.0/users/2"}], "http_etag": "\"cad820684c756eb04bc8968d4f91288f13498e66\"", + "delivery_mode": "regular", "email": "su@example.com", "http_etag": "\"aa48f3a38b3aca7b79147cf59c18f45e72e7a324\"", + "list_id": "foo.example.com", "member_id": 1975, "moderation_action": "accept", + "role": "owner", "self_link": "http://localhost:9001/3.0/members/1975", "user": + "http://localhost:9001/3.0/users/1286"}], "http_etag": "\"5e208f7e1de4d90d63df65d4b7deb0de8b96ffd1\"", "start": 0, "total_size": 1}'} headers: - content-length: ['477'] + content-length: ['486'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/moderator response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -95,7 +95,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -110,64 +110,64 @@ body: list_id=foo.example.com&role=owner&subscriber=newowner%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/8'] + location: ['http://localhost:9001/3.0/members/1976'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/newowner@example.com", "delivery_mode": "regular", "email": "newowner@example.com", "http_etag": - "\"cb2189f8ba0ef7b4c13784d0d4bd22d7fc1056bf\"", "list_id": "foo.example.com", - "member_id": 8, "moderation_action": "accept", "role": "owner", "self_link": - "http://localhost:9001/3.0/members/8", "user": "http://localhost:9001/3.0/users/3"}, + "\"4e87176a1aadd0e18d121fafb51a15678b95de98\"", "list_id": "foo.example.com", + "member_id": 1976, "moderation_action": "accept", "role": "owner", "self_link": + "http://localhost:9001/3.0/members/1976", "user": "http://localhost:9001/3.0/users/1287"}, {"address": "http://localhost:9001/3.0/addresses/su@example.com", "delivery_mode": - "regular", "email": "su@example.com", "http_etag": "\"41d57890ce496889a5e5228b4fe371df4c366828\"", - "list_id": "foo.example.com", "member_id": 7, "moderation_action": "accept", - "role": "owner", "self_link": "http://localhost:9001/3.0/members/7", "user": - "http://localhost:9001/3.0/users/2"}], "http_etag": "\"e6c44c2170ac8bf35b3c83f0bf8fbd3f35549e16\"", + "regular", "email": "su@example.com", "http_etag": "\"aa48f3a38b3aca7b79147cf59c18f45e72e7a324\"", + "list_id": "foo.example.com", "member_id": 1975, "moderation_action": "accept", + "role": "owner", "self_link": "http://localhost:9001/3.0/members/1975", "user": + "http://localhost:9001/3.0/users/1286"}], "http_etag": "\"83c8a71ab5ceaca0703a8c8ad1ec500f1b98e6dc\"", "start": 0, "total_size": 2}'} headers: - content-length: ['863'] + content-length: ['881'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/newowner@example.com", "delivery_mode": "regular", "email": "newowner@example.com", "http_etag": - "\"cb2189f8ba0ef7b4c13784d0d4bd22d7fc1056bf\"", "list_id": "foo.example.com", - "member_id": 8, "moderation_action": "accept", "role": "owner", "self_link": - "http://localhost:9001/3.0/members/8", "user": "http://localhost:9001/3.0/users/3"}, + "\"4e87176a1aadd0e18d121fafb51a15678b95de98\"", "list_id": "foo.example.com", + "member_id": 1976, "moderation_action": "accept", "role": "owner", "self_link": + "http://localhost:9001/3.0/members/1976", "user": "http://localhost:9001/3.0/users/1287"}, {"address": "http://localhost:9001/3.0/addresses/su@example.com", "delivery_mode": - "regular", "email": "su@example.com", "http_etag": "\"41d57890ce496889a5e5228b4fe371df4c366828\"", - "list_id": "foo.example.com", "member_id": 7, "moderation_action": "accept", - "role": "owner", "self_link": "http://localhost:9001/3.0/members/7", "user": - "http://localhost:9001/3.0/users/2"}], "http_etag": "\"e6c44c2170ac8bf35b3c83f0bf8fbd3f35549e16\"", + "regular", "email": "su@example.com", "http_etag": "\"aa48f3a38b3aca7b79147cf59c18f45e72e7a324\"", + "list_id": "foo.example.com", "member_id": 1975, "moderation_action": "accept", + "role": "owner", "self_link": "http://localhost:9001/3.0/members/1975", "user": + "http://localhost:9001/3.0/users/1286"}], "http_etag": "\"83c8a71ab5ceaca0703a8c8ad1ec500f1b98e6dc\"", "start": 0, "total_size": 2}'} headers: - content-length: ['863'] + content-length: ['881'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -182,59 +182,59 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/su@example.com response: body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag": - "\"b36f8ca1d91d583901c768dc116815282d469c66\"", "is_server_owner": false, - "self_link": "http://localhost:9001/3.0/users/2", "user_id": 2}'} + "\"a3f0c3dc174b9c4fc253d4787d37de5df178d4c2\"", "is_server_owner": false, + "self_link": "http://localhost:9001/3.0/users/1286", "user_id": 1286}'} headers: - content-length: ['188'] + content-length: ['194'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/users/2/addresses + method: !!python/unicode GET + uri: http://localhost:9001/3.0/users/1286/addresses response: body: {string: !!python/unicode '{"entries": [{"email": "su@example.com", "http_etag": - "\"a8988d233ad4b9e8641ad5d75553912565efec83\"", "original_email": "su@example.com", + "\"9ac7d43d92b3c701fb5041d65a0f9fca6380b613\"", "original_email": "su@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/su@example.com", - "user": "http://localhost:9001/3.0/users/2"}], "http_etag": "\"7cc723891821fbf8b0974c2ec407cca11fbb6726\"", + "user": "http://localhost:9001/3.0/users/1286"}], "http_etag": "\"484dad2ec4bf3cd0102e524d3ebb4750f5054ed0\"", "start": 0, "total_size": 1}'} headers: - content-length: ['381'] + content-length: ['384'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/newowner@example.com", "delivery_mode": "regular", "email": "newowner@example.com", "http_etag": - "\"cb2189f8ba0ef7b4c13784d0d4bd22d7fc1056bf\"", "list_id": "foo.example.com", - "member_id": 8, "moderation_action": "accept", "role": "owner", "self_link": - "http://localhost:9001/3.0/members/8", "user": "http://localhost:9001/3.0/users/3"}, + "\"4e87176a1aadd0e18d121fafb51a15678b95de98\"", "list_id": "foo.example.com", + "member_id": 1976, "moderation_action": "accept", "role": "owner", "self_link": + "http://localhost:9001/3.0/members/1976", "user": "http://localhost:9001/3.0/users/1287"}, {"address": "http://localhost:9001/3.0/addresses/su@example.com", "delivery_mode": - "regular", "email": "su@example.com", "http_etag": "\"41d57890ce496889a5e5228b4fe371df4c366828\"", - "list_id": "foo.example.com", "member_id": 7, "moderation_action": "accept", - "role": "owner", "self_link": "http://localhost:9001/3.0/members/7", "user": - "http://localhost:9001/3.0/users/2"}], "http_etag": "\"e6c44c2170ac8bf35b3c83f0bf8fbd3f35549e16\"", + "regular", "email": "su@example.com", "http_etag": "\"aa48f3a38b3aca7b79147cf59c18f45e72e7a324\"", + "list_id": "foo.example.com", "member_id": 1975, "moderation_action": "accept", + "role": "owner", "self_link": "http://localhost:9001/3.0/members/1975", "user": + "http://localhost:9001/3.0/users/1286"}], "http_etag": "\"83c8a71ab5ceaca0703a8c8ad1ec500f1b98e6dc\"", "start": 0, "total_size": 2}'} headers: - content-length: ['863'] + content-length: ['881'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/moderator response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -247,7 +247,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -262,29 +262,29 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/newowner@example.com", "delivery_mode": "regular", "email": "newowner@example.com", "http_etag": - "\"cb2189f8ba0ef7b4c13784d0d4bd22d7fc1056bf\"", "list_id": "foo.example.com", - "member_id": 8, "moderation_action": "accept", "role": "owner", "self_link": - "http://localhost:9001/3.0/members/8", "user": "http://localhost:9001/3.0/users/3"}, + "\"4e87176a1aadd0e18d121fafb51a15678b95de98\"", "list_id": "foo.example.com", + "member_id": 1976, "moderation_action": "accept", "role": "owner", "self_link": + "http://localhost:9001/3.0/members/1976", "user": "http://localhost:9001/3.0/users/1287"}, {"address": "http://localhost:9001/3.0/addresses/su@example.com", "delivery_mode": - "regular", "email": "su@example.com", "http_etag": "\"41d57890ce496889a5e5228b4fe371df4c366828\"", - "list_id": "foo.example.com", "member_id": 7, "moderation_action": "accept", - "role": "owner", "self_link": "http://localhost:9001/3.0/members/7", "user": - "http://localhost:9001/3.0/users/2"}], "http_etag": "\"e6c44c2170ac8bf35b3c83f0bf8fbd3f35549e16\"", + "regular", "email": "su@example.com", "http_etag": "\"aa48f3a38b3aca7b79147cf59c18f45e72e7a324\"", + "list_id": "foo.example.com", "member_id": 1975, "moderation_action": "accept", + "role": "owner", "self_link": "http://localhost:9001/3.0/members/1975", "user": + "http://localhost:9001/3.0/users/1286"}], "http_etag": "\"83c8a71ab5ceaca0703a8c8ad1ec500f1b98e6dc\"", "start": 0, "total_size": 2}'} headers: - content-length: ['863'] + content-length: ['881'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com/owner/newowner@example.com response: body: {string: !!python/unicode ''} @@ -295,17 +295,17 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/su@example.com", - "delivery_mode": "regular", "email": "su@example.com", "http_etag": "\"41d57890ce496889a5e5228b4fe371df4c366828\"", - "list_id": "foo.example.com", "member_id": 7, "moderation_action": "accept", - "role": "owner", "self_link": "http://localhost:9001/3.0/members/7", "user": - "http://localhost:9001/3.0/users/2"}], "http_etag": "\"cad820684c756eb04bc8968d4f91288f13498e66\"", + "delivery_mode": "regular", "email": "su@example.com", "http_etag": "\"aa48f3a38b3aca7b79147cf59c18f45e72e7a324\"", + "list_id": "foo.example.com", "member_id": 1975, "moderation_action": "accept", + "role": "owner", "self_link": "http://localhost:9001/3.0/members/1975", "user": + "http://localhost:9001/3.0/users/1286"}], "http_etag": "\"5e208f7e1de4d90d63df65d4b7deb0de8b96ffd1\"", "start": 0, "total_size": 1}'} headers: - content-length: ['477'] + content-length: ['486'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} version: 1 diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner_self_last.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner_self_last.yaml index e7e2278..46f7e05 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner_self_last.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_members_owner_self_last.yaml @@ -3,7 +3,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -18,64 +18,64 @@ body: list_id=foo.example.com&role=owner&subscriber=otherowner%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/5'] + location: ['http://localhost:9001/3.0/members/1973'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/otherowner@example.com", "delivery_mode": "regular", "email": "otherowner@example.com", "http_etag": - "\"39455ab3883c5cb41d206acfc6f5f9d34d8977ad\"", "list_id": "foo.example.com", - "member_id": 5, "moderation_action": "accept", "role": "owner", "self_link": - "http://localhost:9001/3.0/members/5", "user": "http://localhost:9001/3.0/users/4"}, + "\"d4fa1b0fcc23be64297b1987fe4584ea219084fa\"", "list_id": "foo.example.com", + "member_id": 1973, "moderation_action": "accept", "role": "owner", "self_link": + "http://localhost:9001/3.0/members/1973", "user": "http://localhost:9001/3.0/users/1288"}, {"address": "http://localhost:9001/3.0/addresses/su@example.com", "delivery_mode": - "regular", "email": "su@example.com", "http_etag": "\"10c27e9e6dc556f9516987be57ab48241c56912e\"", - "list_id": "foo.example.com", "member_id": 4, "moderation_action": "accept", - "role": "owner", "self_link": "http://localhost:9001/3.0/members/4", "user": - "http://localhost:9001/3.0/users/2"}], "http_etag": "\"71540af6234005a7ae65241748770c8e6a80357c\"", + "regular", "email": "su@example.com", "http_etag": "\"6e7e02142cfa8adb0a490ab591f8842391f2c6b0\"", + "list_id": "foo.example.com", "member_id": 1972, "moderation_action": "accept", + "role": "owner", "self_link": "http://localhost:9001/3.0/members/1972", "user": + "http://localhost:9001/3.0/users/1286"}], "http_etag": "\"a735154395fdcaf0e92089be3fce01b3814cd132\"", "start": 0, "total_size": 2}'} headers: - content-length: ['867'] + content-length: ['885'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/otherowner@example.com", "delivery_mode": "regular", "email": "otherowner@example.com", "http_etag": - "\"39455ab3883c5cb41d206acfc6f5f9d34d8977ad\"", "list_id": "foo.example.com", - "member_id": 5, "moderation_action": "accept", "role": "owner", "self_link": - "http://localhost:9001/3.0/members/5", "user": "http://localhost:9001/3.0/users/4"}, + "\"d4fa1b0fcc23be64297b1987fe4584ea219084fa\"", "list_id": "foo.example.com", + "member_id": 1973, "moderation_action": "accept", "role": "owner", "self_link": + "http://localhost:9001/3.0/members/1973", "user": "http://localhost:9001/3.0/users/1288"}, {"address": "http://localhost:9001/3.0/addresses/su@example.com", "delivery_mode": - "regular", "email": "su@example.com", "http_etag": "\"10c27e9e6dc556f9516987be57ab48241c56912e\"", - "list_id": "foo.example.com", "member_id": 4, "moderation_action": "accept", - "role": "owner", "self_link": "http://localhost:9001/3.0/members/4", "user": - "http://localhost:9001/3.0/users/2"}], "http_etag": "\"71540af6234005a7ae65241748770c8e6a80357c\"", + "regular", "email": "su@example.com", "http_etag": "\"6e7e02142cfa8adb0a490ab591f8842391f2c6b0\"", + "list_id": "foo.example.com", "member_id": 1972, "moderation_action": "accept", + "role": "owner", "self_link": "http://localhost:9001/3.0/members/1972", "user": + "http://localhost:9001/3.0/users/1286"}], "http_etag": "\"a735154395fdcaf0e92089be3fce01b3814cd132\"", "start": 0, "total_size": 2}'} headers: - content-length: ['867'] + content-length: ['885'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -90,29 +90,29 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/otherowner@example.com", "delivery_mode": "regular", "email": "otherowner@example.com", "http_etag": - "\"39455ab3883c5cb41d206acfc6f5f9d34d8977ad\"", "list_id": "foo.example.com", - "member_id": 5, "moderation_action": "accept", "role": "owner", "self_link": - "http://localhost:9001/3.0/members/5", "user": "http://localhost:9001/3.0/users/4"}, + "\"d4fa1b0fcc23be64297b1987fe4584ea219084fa\"", "list_id": "foo.example.com", + "member_id": 1973, "moderation_action": "accept", "role": "owner", "self_link": + "http://localhost:9001/3.0/members/1973", "user": "http://localhost:9001/3.0/users/1288"}, {"address": "http://localhost:9001/3.0/addresses/su@example.com", "delivery_mode": - "regular", "email": "su@example.com", "http_etag": "\"10c27e9e6dc556f9516987be57ab48241c56912e\"", - "list_id": "foo.example.com", "member_id": 4, "moderation_action": "accept", - "role": "owner", "self_link": "http://localhost:9001/3.0/members/4", "user": - "http://localhost:9001/3.0/users/2"}], "http_etag": "\"71540af6234005a7ae65241748770c8e6a80357c\"", + "regular", "email": "su@example.com", "http_etag": "\"6e7e02142cfa8adb0a490ab591f8842391f2c6b0\"", + "list_id": "foo.example.com", "member_id": 1972, "moderation_action": "accept", + "role": "owner", "self_link": "http://localhost:9001/3.0/members/1972", "user": + "http://localhost:9001/3.0/users/1286"}], "http_etag": "\"a735154395fdcaf0e92089be3fce01b3814cd132\"", "start": 0, "total_size": 2}'} headers: - content-length: ['867'] + content-length: ['885'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com/owner/su@example.com response: body: {string: !!python/unicode ''} @@ -123,38 +123,38 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/otherowner@example.com", "delivery_mode": "regular", "email": "otherowner@example.com", "http_etag": - "\"39455ab3883c5cb41d206acfc6f5f9d34d8977ad\"", "list_id": "foo.example.com", - "member_id": 5, "moderation_action": "accept", "role": "owner", "self_link": - "http://localhost:9001/3.0/members/5", "user": "http://localhost:9001/3.0/users/4"}], - "http_etag": "\"6129b0373898970dfff1cf574ce14c0ee30b84ca\"", "start": 0, "total_size": + "\"d4fa1b0fcc23be64297b1987fe4584ea219084fa\"", "list_id": "foo.example.com", + "member_id": 1973, "moderation_action": "accept", "role": "owner", "self_link": + "http://localhost:9001/3.0/members/1973", "user": "http://localhost:9001/3.0/users/1288"}], + "http_etag": "\"143926307aa1047b8f13d199a774054f769e87de\"", "start": 0, "total_size": 1}'} headers: - content-length: ['493'] + content-length: ['502'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: list_id=foo.example.com&role=owner&subscriber=su%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/6'] + location: ['http://localhost:9001/3.0/members/1974'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com/owner/otherowner@example.com response: body: {string: !!python/unicode ''} @@ -165,41 +165,41 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/su@example.com", - "delivery_mode": "regular", "email": "su@example.com", "http_etag": "\"3b037df8d9ab871f6a55ce119b3f3f7e2b1ea69d\"", - "list_id": "foo.example.com", "member_id": 6, "moderation_action": "accept", - "role": "owner", "self_link": "http://localhost:9001/3.0/members/6", "user": - "http://localhost:9001/3.0/users/2"}], "http_etag": "\"3b23baf8158b66e778e6cfbf22afb7a26aafcab3\"", + "delivery_mode": "regular", "email": "su@example.com", "http_etag": "\"2968cd1943529ec88cdbfaffec2ca89404fd7584\"", + "list_id": "foo.example.com", "member_id": 1974, "moderation_action": "accept", + "role": "owner", "self_link": "http://localhost:9001/3.0/members/1974", "user": + "http://localhost:9001/3.0/users/1286"}], "http_etag": "\"7d0d9a959e571eedab7dacbba202d1f5697143ef\"", "start": 0, "total_size": 1}'} headers: - content-length: ['477'] + content-length: ['486'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/su@example.com", - "delivery_mode": "regular", "email": "su@example.com", "http_etag": "\"3b037df8d9ab871f6a55ce119b3f3f7e2b1ea69d\"", - "list_id": "foo.example.com", "member_id": 6, "moderation_action": "accept", - "role": "owner", "self_link": "http://localhost:9001/3.0/members/6", "user": - "http://localhost:9001/3.0/users/2"}], "http_etag": "\"3b23baf8158b66e778e6cfbf22afb7a26aafcab3\"", + "delivery_mode": "regular", "email": "su@example.com", "http_etag": "\"2968cd1943529ec88cdbfaffec2ca89404fd7584\"", + "list_id": "foo.example.com", "member_id": 1974, "moderation_action": "accept", + "role": "owner", "self_link": "http://localhost:9001/3.0/members/1974", "user": + "http://localhost:9001/3.0/users/1286"}], "http_etag": "\"7d0d9a959e571eedab7dacbba202d1f5697143ef\"", "start": 0, "total_size": 1}'} headers: - content-length: ['477'] + content-length: ['486'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -214,34 +214,34 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/su@example.com", - "delivery_mode": "regular", "email": "su@example.com", "http_etag": "\"3b037df8d9ab871f6a55ce119b3f3f7e2b1ea69d\"", - "list_id": "foo.example.com", "member_id": 6, "moderation_action": "accept", - "role": "owner", "self_link": "http://localhost:9001/3.0/members/6", "user": - "http://localhost:9001/3.0/users/2"}], "http_etag": "\"3b23baf8158b66e778e6cfbf22afb7a26aafcab3\"", + "delivery_mode": "regular", "email": "su@example.com", "http_etag": "\"2968cd1943529ec88cdbfaffec2ca89404fd7584\"", + "list_id": "foo.example.com", "member_id": 1974, "moderation_action": "accept", + "role": "owner", "self_link": "http://localhost:9001/3.0/members/1974", "user": + "http://localhost:9001/3.0/users/1286"}], "http_etag": "\"7d0d9a959e571eedab7dacbba202d1f5697143ef\"", "start": 0, "total_size": 1}'} headers: - content-length: ['477'] + content-length: ['486'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/su@example.com", - "delivery_mode": "regular", "email": "su@example.com", "http_etag": "\"3b037df8d9ab871f6a55ce119b3f3f7e2b1ea69d\"", - "list_id": "foo.example.com", "member_id": 6, "moderation_action": "accept", - "role": "owner", "self_link": "http://localhost:9001/3.0/members/6", "user": - "http://localhost:9001/3.0/users/2"}], "http_etag": "\"3b23baf8158b66e778e6cfbf22afb7a26aafcab3\"", + "delivery_mode": "regular", "email": "su@example.com", "http_etag": "\"2968cd1943529ec88cdbfaffec2ca89404fd7584\"", + "list_id": "foo.example.com", "member_id": 1974, "moderation_action": "accept", + "role": "owner", "self_link": "http://localhost:9001/3.0/members/1974", "user": + "http://localhost:9001/3.0/users/1286"}], "http_etag": "\"7d0d9a959e571eedab7dacbba202d1f5697143ef\"", "start": 0, "total_size": 1}'} headers: - content-length: ['477'] + content-length: ['486'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} version: 1 diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription.yaml index 86e6666..9c47bad 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription.yaml @@ -3,35 +3,20 @@ body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -46,8 +31,8 @@ body: fqdn_listname=open_list%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -59,7 +44,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com response: body: {string: !!python/unicode '{"display_name": "Open_list", "fqdn_listname": @@ -75,7 +60,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": @@ -107,8 +92,8 @@ body: subscription_policy=open headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'PATCH' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode PATCH uri: http://localhost:9001/3.0/lists/open_list@example.com/config response: body: {string: !!python/unicode ''} @@ -119,8 +104,8 @@ body: fqdn_listname=moderate_subs%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -132,7 +117,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs.example.com response: body: {string: !!python/unicode '{"display_name": "Moderate_subs", "fqdn_listname": @@ -148,7 +133,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": @@ -180,8 +165,8 @@ body: subscription_policy=moderate headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'PATCH' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode PATCH uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/config response: body: {string: !!python/unicode ''} @@ -192,22 +177,22 @@ body: email=test%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/users response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/users/7'] + location: ['http://localhost:9001/3.0/users/1280'] status: {code: 201, message: Created} - request: body: email=fritz%40example.org headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' - uri: http://localhost:9001/3.0/users/7/addresses + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/users/1280/addresses response: body: {string: !!python/unicode ''} headers: @@ -218,7 +203,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'POST' + method: !!python/unicode POST uri: http://localhost:9001/3.0/addresses/fritz@example.org/verify response: body: {string: !!python/unicode ''} @@ -229,7 +214,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list@example.com/requests response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -242,13 +227,13 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/requests response: body: {string: !!python/unicode '{"entries": [{"display_name": "", "email": "fritz@example.org", - "http_etag": "\"0a06f92e13b074179aea47cc383638ed057373d6\"", "list_id": "moderate_subs.example.com", - "token": "e37c5ce90f41b32d1d184aeeb94b35c9d130ab1f", "token_owner": "moderator", - "type": "subscription", "when": "2005-08-01T07:49:23"}], "http_etag": "\"ff55df779242fb33ef331e5ca64480b421c76978\"", + "http_etag": "\"dd7cd98a3fbaaf296ea4dcf35b6e0510dfe73b4d\"", "list_id": "moderate_subs.example.com", + "token": "006d37626465296e5e4a0398a5170abf8c448bf5", "token_owner": "moderator", + "type": "subscription", "when": "2005-08-01T07:49:23"}], "http_etag": "\"f903f6f7dbb5e56ff9d3360b5080d7729fc539b9\"", "start": 0, "total_size": 1}'} headers: content-length: ['392'] @@ -258,9 +243,9 @@ body: action=discard headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' - uri: http://localhost:9001/3.0/lists/moderate_subs.example.com/requests/e37c5ce90f41b32d1d184aeeb94b35c9d130ab1f + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/lists/moderate_subs.example.com/requests/006d37626465296e5e4a0398a5170abf8c448bf5 response: body: {string: !!python/unicode ''} headers: @@ -270,7 +255,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/open_list@example.com response: body: {string: !!python/unicode ''} @@ -281,7 +266,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/moderate_subs@example.com response: body: {string: !!python/unicode ''} @@ -292,8 +277,19 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' - uri: http://localhost:9001/3.0/users/7 + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/users/1280 + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode ''} headers: @@ -303,35 +299,20 @@ body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -346,8 +327,8 @@ body: fqdn_listname=open_list%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -359,7 +340,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com response: body: {string: !!python/unicode '{"display_name": "Open_list", "fqdn_listname": @@ -375,7 +356,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": @@ -407,8 +388,8 @@ body: subscription_policy=open headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'PATCH' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode PATCH uri: http://localhost:9001/3.0/lists/open_list@example.com/config response: body: {string: !!python/unicode ''} @@ -419,8 +400,8 @@ body: fqdn_listname=moderate_subs%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -432,7 +413,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs.example.com response: body: {string: !!python/unicode '{"display_name": "Moderate_subs", "fqdn_listname": @@ -448,7 +429,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": @@ -480,8 +461,8 @@ body: subscription_policy=moderate headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'PATCH' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode PATCH uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/config response: body: {string: !!python/unicode ''} @@ -492,22 +473,22 @@ body: email=test%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/users response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/users/8'] + location: ['http://localhost:9001/3.0/users/1281'] status: {code: 201, message: Created} - request: body: email=fritz%40example.org headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' - uri: http://localhost:9001/3.0/users/8/addresses + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/users/1281/addresses response: body: {string: !!python/unicode ''} headers: @@ -518,7 +499,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'POST' + method: !!python/unicode POST uri: http://localhost:9001/3.0/addresses/fritz@example.org/verify response: body: {string: !!python/unicode ''} @@ -529,7 +510,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list@example.com/requests response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -542,7 +523,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/requests response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -555,7 +536,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/open_list@example.com response: body: {string: !!python/unicode ''} @@ -566,7 +547,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/moderate_subs@example.com response: body: {string: !!python/unicode ''} @@ -577,8 +558,19 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' - uri: http://localhost:9001/3.0/users/8 + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/users/1281 + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode ''} headers: @@ -588,35 +580,20 @@ body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -631,8 +608,8 @@ body: fqdn_listname=open_list%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -644,7 +621,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com response: body: {string: !!python/unicode '{"display_name": "Open_list", "fqdn_listname": @@ -660,7 +637,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": @@ -692,8 +669,8 @@ body: subscription_policy=open headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'PATCH' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode PATCH uri: http://localhost:9001/3.0/lists/open_list@example.com/config response: body: {string: !!python/unicode ''} @@ -704,8 +681,8 @@ body: fqdn_listname=moderate_subs%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -717,7 +694,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs.example.com response: body: {string: !!python/unicode '{"display_name": "Moderate_subs", "fqdn_listname": @@ -733,7 +710,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": @@ -765,8 +742,8 @@ body: subscription_policy=moderate headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'PATCH' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode PATCH uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/config response: body: {string: !!python/unicode ''} @@ -777,22 +754,22 @@ body: email=test%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/users response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/users/9'] + location: ['http://localhost:9001/3.0/users/1282'] status: {code: 201, message: Created} - request: body: email=fritz%40example.org headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' - uri: http://localhost:9001/3.0/users/9/addresses + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/users/1282/addresses response: body: {string: !!python/unicode ''} headers: @@ -803,7 +780,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'POST' + method: !!python/unicode POST uri: http://localhost:9001/3.0/addresses/fritz@example.org/verify response: body: {string: !!python/unicode ''} @@ -814,7 +791,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list@example.com/requests response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -827,13 +804,13 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/requests response: body: {string: !!python/unicode '{"entries": [{"display_name": "", "email": "test@example.com", - "http_etag": "\"937ec6a877c83572ec19fed7d46a5a43cf9576a0\"", "list_id": "moderate_subs.example.com", - "token": "8e65d4f061a6a9eea170f02fe8bc12342cd5cdd6", "token_owner": "moderator", - "type": "subscription", "when": "2005-08-01T07:49:23"}], "http_etag": "\"08e1bdf6d045feeada1764fe6a1d38a6bd08c3c6\"", + "http_etag": "\"97e554e0a4fceea7cc0b6cd4deac3f2f1f95cb53\"", "list_id": "moderate_subs.example.com", + "token": "9afe5553277c0115910b17f8262dbe5a3b44f1d1", "token_owner": "moderator", + "type": "subscription", "when": "2005-08-01T07:49:23"}], "http_etag": "\"bfafc60e71306deac28db4aa681d5d02c39e0714\"", "start": 0, "total_size": 1}'} headers: content-length: ['391'] @@ -843,9 +820,9 @@ body: action=discard headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' - uri: http://localhost:9001/3.0/lists/moderate_subs.example.com/requests/8e65d4f061a6a9eea170f02fe8bc12342cd5cdd6 + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/lists/moderate_subs.example.com/requests/9afe5553277c0115910b17f8262dbe5a3b44f1d1 response: body: {string: !!python/unicode ''} headers: @@ -855,7 +832,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/open_list@example.com response: body: {string: !!python/unicode ''} @@ -866,7 +843,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/moderate_subs@example.com response: body: {string: !!python/unicode ''} @@ -877,8 +854,19 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' - uri: http://localhost:9001/3.0/users/9 + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/users/1282 + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode ''} headers: @@ -888,35 +876,20 @@ body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -931,8 +904,8 @@ body: fqdn_listname=open_list%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -944,7 +917,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com response: body: {string: !!python/unicode '{"display_name": "Open_list", "fqdn_listname": @@ -960,7 +933,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": @@ -992,8 +965,8 @@ body: subscription_policy=open headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'PATCH' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode PATCH uri: http://localhost:9001/3.0/lists/open_list@example.com/config response: body: {string: !!python/unicode ''} @@ -1004,8 +977,8 @@ body: fqdn_listname=moderate_subs%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -1017,7 +990,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs.example.com response: body: {string: !!python/unicode '{"display_name": "Moderate_subs", "fqdn_listname": @@ -1033,7 +1006,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": @@ -1065,8 +1038,8 @@ body: subscription_policy=moderate headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'PATCH' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode PATCH uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/config response: body: {string: !!python/unicode ''} @@ -1077,22 +1050,22 @@ body: email=test%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/users response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/users/10'] + location: ['http://localhost:9001/3.0/users/1283'] status: {code: 201, message: Created} - request: body: email=fritz%40example.org headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' - uri: http://localhost:9001/3.0/users/10/addresses + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/users/1283/addresses response: body: {string: !!python/unicode ''} headers: @@ -1103,7 +1076,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'POST' + method: !!python/unicode POST uri: http://localhost:9001/3.0/addresses/fritz@example.org/verify response: body: {string: !!python/unicode ''} @@ -1114,7 +1087,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list@example.com/requests response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -1127,7 +1100,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/requests response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -1140,7 +1113,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/open_list@example.com response: body: {string: !!python/unicode ''} @@ -1151,7 +1124,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/moderate_subs@example.com response: body: {string: !!python/unicode ''} @@ -1162,8 +1135,19 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' - uri: http://localhost:9001/3.0/users/10 + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/users/1283 + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode ''} headers: @@ -1173,35 +1157,20 @@ body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -1216,8 +1185,8 @@ body: fqdn_listname=open_list%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -1229,7 +1198,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com response: body: {string: !!python/unicode '{"display_name": "Open_list", "fqdn_listname": @@ -1245,7 +1214,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": @@ -1277,8 +1246,8 @@ body: subscription_policy=open headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'PATCH' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode PATCH uri: http://localhost:9001/3.0/lists/open_list@example.com/config response: body: {string: !!python/unicode ''} @@ -1289,8 +1258,8 @@ body: fqdn_listname=moderate_subs%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -1302,7 +1271,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs.example.com response: body: {string: !!python/unicode '{"display_name": "Moderate_subs", "fqdn_listname": @@ -1318,7 +1287,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": @@ -1350,8 +1319,8 @@ body: subscription_policy=moderate headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'PATCH' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode PATCH uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/config response: body: {string: !!python/unicode ''} @@ -1362,22 +1331,22 @@ body: email=test%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/users response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/users/11'] + location: ['http://localhost:9001/3.0/users/1284'] status: {code: 201, message: Created} - request: body: email=fritz%40example.org headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' - uri: http://localhost:9001/3.0/users/11/addresses + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/users/1284/addresses response: body: {string: !!python/unicode ''} headers: @@ -1388,7 +1357,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'POST' + method: !!python/unicode POST uri: http://localhost:9001/3.0/addresses/fritz@example.org/verify response: body: {string: !!python/unicode ''} @@ -1399,7 +1368,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list@example.com/requests response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -1412,7 +1381,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/requests response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -1425,7 +1394,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/open_list@example.com response: body: {string: !!python/unicode ''} @@ -1436,7 +1405,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/moderate_subs@example.com response: body: {string: !!python/unicode ''} @@ -1447,8 +1416,19 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' - uri: http://localhost:9001/3.0/users/11 + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/users/1284 + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode ''} headers: diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_mod_primary.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_mod_primary.yaml index dbe1a58..3fb981c 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_mod_primary.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_mod_primary.yaml @@ -3,7 +3,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs.example.com response: body: {string: !!python/unicode '{"display_name": "Moderate_subs", "fqdn_listname": @@ -19,42 +19,42 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/test@example.com response: body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag": - "\"739541064746f57a1e7f11125e22a0bc9014fa20\"", "is_server_owner": false, - "password": "$6$rounds=683624$wpa8XYtDnGTv6XH/$30vzQOIJPB3xuhOiJgtS.x4sifH2PBoqfiJM540czTIqk6I1Pmc0YfZDSARcSxUnp/GmHF3TldC.prCq9CgJA/", - "self_link": "http://localhost:9001/3.0/users/9", "user_id": 9}'} + "\"6cb191c4493da81a759d55a4bbf47be6d37a2b8a\"", "is_server_owner": false, + "password": "$6$rounds=624686$JK03tCAFeY0ScCEH$JJvn3m1dGdMOEz/jcT2m1EAMtf4dcXMzgnPIDxgLbfl5JehIDPWbzVyURIgq/xKRU9lj3zwcfFQJvhEe9apDm0", + "self_link": "http://localhost:9001/3.0/users/1282", "user_id": 1282}'} headers: - content-length: ['324'] + content-length: ['330'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/users/9/addresses + method: !!python/unicode GET + uri: http://localhost:9001/3.0/users/1282/addresses response: body: {string: !!python/unicode '{"entries": [{"email": "fritz@example.org", "http_etag": - "\"8d3a06e7ab49e4715967bd3b56099967748b6868\"", "original_email": "fritz@example.org", + "\"36e56fc2ef1a1566f2a5fa5769907b59cce867b7\"", "original_email": "fritz@example.org", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/fritz@example.org", - "user": "http://localhost:9001/3.0/users/9", "verified_on": "2005-08-01T07:49:23"}, - {"email": "test@example.com", "http_etag": "\"83c6dfb813c2b4484f0c15eb434e104521bb2409\"", + "user": "http://localhost:9001/3.0/users/1282", "verified_on": "2005-08-01T07:49:23"}, + {"email": "test@example.com", "http_etag": "\"cb6913fb78aa2cefbacb5e9896525aa2c6c5d763\"", "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user": - "http://localhost:9001/3.0/users/9"}], "http_etag": "\"f936e2df1794def099840486f4b0cf7a24e838c8\"", + "http://localhost:9001/3.0/users/1282"}], "http_etag": "\"7a5a45cc3d752a7313dc0f4a5bb2d225562ceb6c\"", "start": 0, "total_size": 2}'} headers: - content-length: ['712'] + content-length: ['718'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs.example.com/roster/owner response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -67,7 +67,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs.example.com/roster/moderator response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -80,12 +80,12 @@ body: display_name=None&list_id=moderate_subs.example.com&pre_confirmed=True&pre_verified=True&subscriber=test%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: - body: {string: !!python/unicode '{"http_etag": "\"2dcad56af0194465915d5d4add9e9b8c61d18ccd\"", - "token": "8e65d4f061a6a9eea170f02fe8bc12342cd5cdd6", "token_owner": "moderator"}'} + body: {string: !!python/unicode '{"http_etag": "\"8999ea419360226638cfdbc64fe0db44d666c6b7\"", + "token": "9afe5553277c0115910b17f8262dbe5a3b44f1d1", "token_owner": "moderator"}'} headers: content-length: ['142'] content-type: [application/json; charset=utf-8] @@ -94,7 +94,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/roster/member response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -107,13 +107,13 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/requests response: body: {string: !!python/unicode '{"entries": [{"display_name": "", "email": "test@example.com", - "http_etag": "\"937ec6a877c83572ec19fed7d46a5a43cf9576a0\"", "list_id": "moderate_subs.example.com", - "token": "8e65d4f061a6a9eea170f02fe8bc12342cd5cdd6", "token_owner": "moderator", - "type": "subscription", "when": "2005-08-01T07:49:23"}], "http_etag": "\"08e1bdf6d045feeada1764fe6a1d38a6bd08c3c6\"", + "http_etag": "\"97e554e0a4fceea7cc0b6cd4deac3f2f1f95cb53\"", "list_id": "moderate_subs.example.com", + "token": "9afe5553277c0115910b17f8262dbe5a3b44f1d1", "token_owner": "moderator", + "type": "subscription", "when": "2005-08-01T07:49:23"}], "http_etag": "\"bfafc60e71306deac28db4aa681d5d02c39e0714\"", "start": 0, "total_size": 1}'} headers: content-length: ['391'] @@ -123,7 +123,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs.example.com response: body: {string: !!python/unicode '{"display_name": "Moderate_subs", "fqdn_listname": @@ -139,43 +139,43 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/test@example.com response: body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag": - "\"739541064746f57a1e7f11125e22a0bc9014fa20\"", "is_server_owner": false, - "password": "$6$rounds=683624$wpa8XYtDnGTv6XH/$30vzQOIJPB3xuhOiJgtS.x4sifH2PBoqfiJM540czTIqk6I1Pmc0YfZDSARcSxUnp/GmHF3TldC.prCq9CgJA/", - "self_link": "http://localhost:9001/3.0/users/9", "user_id": 9}'} + "\"6cb191c4493da81a759d55a4bbf47be6d37a2b8a\"", "is_server_owner": false, + "password": "$6$rounds=624686$JK03tCAFeY0ScCEH$JJvn3m1dGdMOEz/jcT2m1EAMtf4dcXMzgnPIDxgLbfl5JehIDPWbzVyURIgq/xKRU9lj3zwcfFQJvhEe9apDm0", + "self_link": "http://localhost:9001/3.0/users/1282", "user_id": 1282}'} headers: - content-length: ['324'] + content-length: ['330'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/users/9/addresses + method: !!python/unicode GET + uri: http://localhost:9001/3.0/users/1282/addresses response: body: {string: !!python/unicode '{"entries": [{"email": "fritz@example.org", "http_etag": - "\"8d3a06e7ab49e4715967bd3b56099967748b6868\"", "original_email": "fritz@example.org", + "\"36e56fc2ef1a1566f2a5fa5769907b59cce867b7\"", "original_email": "fritz@example.org", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/fritz@example.org", - "user": "http://localhost:9001/3.0/users/9", "verified_on": "2005-08-01T07:49:23"}, - {"email": "test@example.com", "http_etag": "\"2afcbb8fefb40767dad968ef1e48b3878327fd41\"", + "user": "http://localhost:9001/3.0/users/1282", "verified_on": "2005-08-01T07:49:23"}, + {"email": "test@example.com", "http_etag": "\"990ec917dac82a64b83120c622499a3cdde42e5e\"", "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user": - "http://localhost:9001/3.0/users/9", "verified_on": "2005-08-01T07:49:23"}], - "http_etag": "\"fc174c7edd4b34be2708e9c2664de68b21006355\"", "start": 0, "total_size": + "http://localhost:9001/3.0/users/1282", "verified_on": "2005-08-01T07:49:23"}], + "http_etag": "\"def753dbbd372f2735a5324fd64c83bd67dcccaf\"", "start": 0, "total_size": 2}'} headers: - content-length: ['750'] + content-length: ['756'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs.example.com/roster/owner response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -188,7 +188,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs.example.com/roster/moderator response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -201,7 +201,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs.example.com/member/test@example.com response: body: {string: !!python/unicode '{}'} @@ -213,7 +213,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs.example.com/member/fritz@example.org response: body: {string: !!python/unicode '{}'} @@ -225,7 +225,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_mod_secondary.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_mod_secondary.yaml index 99996b1..3758e87 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_mod_secondary.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_mod_secondary.yaml @@ -3,7 +3,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs.example.com response: body: {string: !!python/unicode '{"display_name": "Moderate_subs", "fqdn_listname": @@ -19,42 +19,42 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/test@example.com response: body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag": - "\"6ecdfd8355bccc05a93dc44aeffbfec86c689b55\"", "is_server_owner": false, - "password": "$6$rounds=685702$4PWBkI8pIWfBeBgM$WpQhbOBYk.h3uSJcEnhSI5JThqDKAa7OSf4Svs9/holRnpG2gueJVttdAHnnJz2iWjbugEWrqhecE5iWJ/xxK0", - "self_link": "http://localhost:9001/3.0/users/7", "user_id": 7}'} + "\"3dddfe92ca5256c96bcf31738fdc16ebb6385c08\"", "is_server_owner": false, + "password": "$6$rounds=623002$88AuGHAluHJzcvwc$SHJ9uCPEfVMbd/.VPS0a9liKR2O.uEcfd9S8c/Io4/gpXEN2Eya2OmxhT/gNdIiboRdS08rb1qCnOvYMRjboN0", + "self_link": "http://localhost:9001/3.0/users/1280", "user_id": 1280}'} headers: - content-length: ['324'] + content-length: ['330'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/users/7/addresses + method: !!python/unicode GET + uri: http://localhost:9001/3.0/users/1280/addresses response: body: {string: !!python/unicode '{"entries": [{"email": "fritz@example.org", "http_etag": - "\"544d5d4924c00a67b82f8d7cddaa5d2ccfd25bb9\"", "original_email": "fritz@example.org", + "\"a0b30f8a0ab2e7d98ad7fbcdbec4fb719a895f85\"", "original_email": "fritz@example.org", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/fritz@example.org", - "user": "http://localhost:9001/3.0/users/7", "verified_on": "2005-08-01T07:49:23"}, - {"email": "test@example.com", "http_etag": "\"deab7596aa4fed8d7db92cd9fc477a4e0fa412f6\"", + "user": "http://localhost:9001/3.0/users/1280", "verified_on": "2005-08-01T07:49:23"}, + {"email": "test@example.com", "http_etag": "\"6780bebe8736c9ef566514695f4999e602162dea\"", "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user": - "http://localhost:9001/3.0/users/7"}], "http_etag": "\"6b96ef3d16bab5a374e8964c90fc1f34ca35f3e7\"", + "http://localhost:9001/3.0/users/1280"}], "http_etag": "\"8c89abfa1a70fd9f8d6b817f5d9e6b7e67463392\"", "start": 0, "total_size": 2}'} headers: - content-length: ['712'] + content-length: ['718'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs.example.com/roster/owner response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -67,7 +67,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs.example.com/roster/moderator response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -80,12 +80,12 @@ body: display_name=None&list_id=moderate_subs.example.com&pre_confirmed=True&pre_verified=True&subscriber=fritz%40example.org headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: - body: {string: !!python/unicode '{"http_etag": "\"d5cd0c73acd682a31a46fe1bbfc20f6ef346f922\"", - "token": "e37c5ce90f41b32d1d184aeeb94b35c9d130ab1f", "token_owner": "moderator"}'} + body: {string: !!python/unicode '{"http_etag": "\"85c7250516e2563472a806800cde872046a74f8b\"", + "token": "006d37626465296e5e4a0398a5170abf8c448bf5", "token_owner": "moderator"}'} headers: content-length: ['142'] content-type: [application/json; charset=utf-8] @@ -94,7 +94,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/roster/member response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -107,13 +107,13 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/requests response: body: {string: !!python/unicode '{"entries": [{"display_name": "", "email": "fritz@example.org", - "http_etag": "\"0a06f92e13b074179aea47cc383638ed057373d6\"", "list_id": "moderate_subs.example.com", - "token": "e37c5ce90f41b32d1d184aeeb94b35c9d130ab1f", "token_owner": "moderator", - "type": "subscription", "when": "2005-08-01T07:49:23"}], "http_etag": "\"ff55df779242fb33ef331e5ca64480b421c76978\"", + "http_etag": "\"dd7cd98a3fbaaf296ea4dcf35b6e0510dfe73b4d\"", "list_id": "moderate_subs.example.com", + "token": "006d37626465296e5e4a0398a5170abf8c448bf5", "token_owner": "moderator", + "type": "subscription", "when": "2005-08-01T07:49:23"}], "http_etag": "\"f903f6f7dbb5e56ff9d3360b5080d7729fc539b9\"", "start": 0, "total_size": 1}'} headers: content-length: ['392'] @@ -123,7 +123,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs.example.com response: body: {string: !!python/unicode '{"display_name": "Moderate_subs", "fqdn_listname": @@ -139,42 +139,42 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/test@example.com response: body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag": - "\"6ecdfd8355bccc05a93dc44aeffbfec86c689b55\"", "is_server_owner": false, - "password": "$6$rounds=685702$4PWBkI8pIWfBeBgM$WpQhbOBYk.h3uSJcEnhSI5JThqDKAa7OSf4Svs9/holRnpG2gueJVttdAHnnJz2iWjbugEWrqhecE5iWJ/xxK0", - "self_link": "http://localhost:9001/3.0/users/7", "user_id": 7}'} + "\"3dddfe92ca5256c96bcf31738fdc16ebb6385c08\"", "is_server_owner": false, + "password": "$6$rounds=623002$88AuGHAluHJzcvwc$SHJ9uCPEfVMbd/.VPS0a9liKR2O.uEcfd9S8c/Io4/gpXEN2Eya2OmxhT/gNdIiboRdS08rb1qCnOvYMRjboN0", + "self_link": "http://localhost:9001/3.0/users/1280", "user_id": 1280}'} headers: - content-length: ['324'] + content-length: ['330'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/users/7/addresses + method: !!python/unicode GET + uri: http://localhost:9001/3.0/users/1280/addresses response: body: {string: !!python/unicode '{"entries": [{"email": "fritz@example.org", "http_etag": - "\"544d5d4924c00a67b82f8d7cddaa5d2ccfd25bb9\"", "original_email": "fritz@example.org", + "\"a0b30f8a0ab2e7d98ad7fbcdbec4fb719a895f85\"", "original_email": "fritz@example.org", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/fritz@example.org", - "user": "http://localhost:9001/3.0/users/7", "verified_on": "2005-08-01T07:49:23"}, - {"email": "test@example.com", "http_etag": "\"deab7596aa4fed8d7db92cd9fc477a4e0fa412f6\"", + "user": "http://localhost:9001/3.0/users/1280", "verified_on": "2005-08-01T07:49:23"}, + {"email": "test@example.com", "http_etag": "\"6780bebe8736c9ef566514695f4999e602162dea\"", "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user": - "http://localhost:9001/3.0/users/7"}], "http_etag": "\"6b96ef3d16bab5a374e8964c90fc1f34ca35f3e7\"", + "http://localhost:9001/3.0/users/1280"}], "http_etag": "\"8c89abfa1a70fd9f8d6b817f5d9e6b7e67463392\"", "start": 0, "total_size": 2}'} headers: - content-length: ['712'] + content-length: ['718'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs.example.com/roster/owner response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -187,7 +187,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs.example.com/roster/moderator response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -200,7 +200,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs.example.com/member/test@example.com response: body: {string: !!python/unicode '{}'} @@ -212,7 +212,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs.example.com/member/fritz@example.org response: body: {string: !!python/unicode '{}'} @@ -224,7 +224,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/moderate_subs@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_open_primary.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_open_primary.yaml index 83fed6e..6349d34 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_open_primary.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_open_primary.yaml @@ -3,7 +3,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com response: body: {string: !!python/unicode '{"display_name": "Open_list", "fqdn_listname": @@ -19,42 +19,42 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/test@example.com response: body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag": - "\"3a30f194bdc856f93b46620b44f11d63317943fd\"", "is_server_owner": false, - "password": "$6$rounds=679674$1cQUdtVLkfjbVgGX$dQDh7CLZ6AmXbswwJfgTZvYBTubXlNrli8eqID5c7z9xrvMiyYCAu89xIbHGIP.BPpbdGdDEPm8njXYXksS2l/", - "self_link": "http://localhost:9001/3.0/users/10", "user_id": 10}'} + "\"6b9bf13155868dd4b3654df95b77ed5972fb897c\"", "is_server_owner": false, + "password": "$6$rounds=673966$ai9jeyedjz5bkwPF$n8YtbF4AcsT0bY7M3HWUSF183kj3zXFz4iXiHT2NNYNer0C8irVR2FzZMFhUKNHuXGWcOG1IiW/9xHmX83rfw.", + "self_link": "http://localhost:9001/3.0/users/1283", "user_id": 1283}'} headers: - content-length: ['326'] + content-length: ['330'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/users/10/addresses + method: !!python/unicode GET + uri: http://localhost:9001/3.0/users/1283/addresses response: body: {string: !!python/unicode '{"entries": [{"email": "fritz@example.org", "http_etag": - "\"df83de584130f7bf666f498f1ee86526580e1e5d\"", "original_email": "fritz@example.org", + "\"73d4497b4ccd8377d46178906c6852778e1914c9\"", "original_email": "fritz@example.org", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/fritz@example.org", - "user": "http://localhost:9001/3.0/users/10", "verified_on": "2005-08-01T07:49:23"}, - {"email": "test@example.com", "http_etag": "\"653c988d25ef432406061ef93716f4d0679d110c\"", + "user": "http://localhost:9001/3.0/users/1283", "verified_on": "2005-08-01T07:49:23"}, + {"email": "test@example.com", "http_etag": "\"34992364f11b8277da245c36a3bd11c84b7ab5d0\"", "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user": - "http://localhost:9001/3.0/users/10"}], "http_etag": "\"397eaf5fbab74d6839a9b154e44abb90a92b220c\"", + "http://localhost:9001/3.0/users/1283"}], "http_etag": "\"ad7506209bb0f13b727b7162ab227228f7af6f3f\"", "start": 0, "total_size": 2}'} headers: - content-length: ['714'] + content-length: ['718'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com/roster/owner response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -67,7 +67,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com/roster/moderator response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -80,37 +80,37 @@ body: display_name=None&list_id=open_list.example.com&pre_confirmed=True&pre_verified=True&subscriber=test%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/20'] + location: ['http://localhost:9001/3.0/members/1968'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list@example.com/roster/member response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/test@example.com", - "delivery_mode": "regular", "email": "test@example.com", "http_etag": "\"bcc72c7d3b6c85ac7c0aa0b0a58afc797fb1adf2\"", - "list_id": "open_list.example.com", "member_id": 20, "moderation_action": - "defer", "role": "member", "self_link": "http://localhost:9001/3.0/members/20", - "user": "http://localhost:9001/3.0/users/10"}], "http_etag": "\"140d9631db84af3d5c21553d544c39457bfc7fe0\"", + "delivery_mode": "regular", "email": "test@example.com", "http_etag": "\"5afc527fdcb3b0d3ca230349f67ad8d6c5e2821d\"", + "list_id": "open_list.example.com", "member_id": 1968, "moderation_action": + "defer", "role": "member", "self_link": "http://localhost:9001/3.0/members/1968", + "user": "http://localhost:9001/3.0/users/1283"}], "http_etag": "\"160131585b4ae5db09d3ad9a7a46d42dd37a04ae\"", "start": 0, "total_size": 1}'} headers: - content-length: ['490'] + content-length: ['496'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list@example.com/requests response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -123,7 +123,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com response: body: {string: !!python/unicode '{"display_name": "Open_list", "fqdn_listname": @@ -139,43 +139,43 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/test@example.com response: body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag": - "\"3a30f194bdc856f93b46620b44f11d63317943fd\"", "is_server_owner": false, - "password": "$6$rounds=679674$1cQUdtVLkfjbVgGX$dQDh7CLZ6AmXbswwJfgTZvYBTubXlNrli8eqID5c7z9xrvMiyYCAu89xIbHGIP.BPpbdGdDEPm8njXYXksS2l/", - "self_link": "http://localhost:9001/3.0/users/10", "user_id": 10}'} + "\"6b9bf13155868dd4b3654df95b77ed5972fb897c\"", "is_server_owner": false, + "password": "$6$rounds=673966$ai9jeyedjz5bkwPF$n8YtbF4AcsT0bY7M3HWUSF183kj3zXFz4iXiHT2NNYNer0C8irVR2FzZMFhUKNHuXGWcOG1IiW/9xHmX83rfw.", + "self_link": "http://localhost:9001/3.0/users/1283", "user_id": 1283}'} headers: - content-length: ['326'] + content-length: ['330'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/users/10/addresses + method: !!python/unicode GET + uri: http://localhost:9001/3.0/users/1283/addresses response: body: {string: !!python/unicode '{"entries": [{"email": "fritz@example.org", "http_etag": - "\"df83de584130f7bf666f498f1ee86526580e1e5d\"", "original_email": "fritz@example.org", + "\"73d4497b4ccd8377d46178906c6852778e1914c9\"", "original_email": "fritz@example.org", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/fritz@example.org", - "user": "http://localhost:9001/3.0/users/10", "verified_on": "2005-08-01T07:49:23"}, - {"email": "test@example.com", "http_etag": "\"1a4e4fafa5f557004d12321255ecbe22b7bc4939\"", + "user": "http://localhost:9001/3.0/users/1283", "verified_on": "2005-08-01T07:49:23"}, + {"email": "test@example.com", "http_etag": "\"582e27f7747435d3fef998ef3b3c32f71d3596f9\"", "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user": - "http://localhost:9001/3.0/users/10", "verified_on": "2005-08-01T07:49:23"}], - "http_etag": "\"6786a8956fe1455ab474e278103e3a85f08e0896\"", "start": 0, "total_size": + "http://localhost:9001/3.0/users/1283", "verified_on": "2005-08-01T07:49:23"}], + "http_etag": "\"88e5fa4d8be19012b6c528ff80d5d85013598b9c\"", "start": 0, "total_size": 2}'} headers: - content-length: ['752'] + content-length: ['756'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com/roster/owner response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -188,7 +188,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com/roster/moderator response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -201,23 +201,23 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com/member/test@example.com response: body: {string: !!python/unicode '{"address": "http://localhost:9001/3.0/addresses/test@example.com", - "delivery_mode": "regular", "email": "test@example.com", "http_etag": "\"bcc72c7d3b6c85ac7c0aa0b0a58afc797fb1adf2\"", - "list_id": "open_list.example.com", "member_id": 20, "moderation_action": - "defer", "role": "member", "self_link": "http://localhost:9001/3.0/members/20", - "user": "http://localhost:9001/3.0/users/10"}'} + "delivery_mode": "regular", "email": "test@example.com", "http_etag": "\"5afc527fdcb3b0d3ca230349f67ad8d6c5e2821d\"", + "list_id": "open_list.example.com", "member_id": 1968, "moderation_action": + "defer", "role": "member", "self_link": "http://localhost:9001/3.0/members/1968", + "user": "http://localhost:9001/3.0/users/1283"}'} headers: - content-length: ['385'] + content-length: ['391'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_open_secondary.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_open_secondary.yaml index be6f5f6..a348386 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_open_secondary.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_open_secondary.yaml @@ -3,7 +3,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com response: body: {string: !!python/unicode '{"display_name": "Open_list", "fqdn_listname": @@ -19,42 +19,42 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/test@example.com response: body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag": - "\"59457b60648550d547ab9ae2bb5b13e07bf49ac0\"", "is_server_owner": false, - "password": "$6$rounds=718894$GbbWwfOe.L9dZPto$Ls9C/1gapb71bbFgUhI3VJAnuj6kd0Wg0Zoldn9M1JzpoV.kfMtMKo22d/SfgeObEJqAsekEjzdXgz4EXaQ2v.", - "self_link": "http://localhost:9001/3.0/users/8", "user_id": 8}'} + "\"da81fca3ec392848c4d4982758137c81be4d01c6\"", "is_server_owner": false, + "password": "$6$rounds=665366$7snUramcoXLslim1$871ryaBeFZwy7ScDOoWQKYcGtB.M5iAYuHaTknatGb9klolfQWclb/2QcMztjMiSPCJQd2IzmG0oeYURG485k/", + "self_link": "http://localhost:9001/3.0/users/1281", "user_id": 1281}'} headers: - content-length: ['324'] + content-length: ['330'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/users/8/addresses + method: !!python/unicode GET + uri: http://localhost:9001/3.0/users/1281/addresses response: body: {string: !!python/unicode '{"entries": [{"email": "fritz@example.org", "http_etag": - "\"daa00b2c01031e3acab906927ca2edd5b5557399\"", "original_email": "fritz@example.org", + "\"beb2a1f203d47dec4e7e5f00a18b758da558edef\"", "original_email": "fritz@example.org", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/fritz@example.org", - "user": "http://localhost:9001/3.0/users/8", "verified_on": "2005-08-01T07:49:23"}, - {"email": "test@example.com", "http_etag": "\"ddda9833ea38cea61dbf611f3cf46fd118cba777\"", + "user": "http://localhost:9001/3.0/users/1281", "verified_on": "2005-08-01T07:49:23"}, + {"email": "test@example.com", "http_etag": "\"4020be5df6e5fe7a87e4ba961cca9f0d3c81956a\"", "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user": - "http://localhost:9001/3.0/users/8"}], "http_etag": "\"9e159c2ae2863bc8ff50f8475e6cb154967eba0c\"", + "http://localhost:9001/3.0/users/1281"}], "http_etag": "\"334ff06e73cec1d77279303824d1c8e498a6e237\"", "start": 0, "total_size": 2}'} headers: - content-length: ['712'] + content-length: ['718'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com/roster/owner response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -67,7 +67,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com/roster/moderator response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -80,37 +80,37 @@ body: display_name=None&list_id=open_list.example.com&pre_confirmed=True&pre_verified=True&subscriber=fritz%40example.org headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/19'] + location: ['http://localhost:9001/3.0/members/1967'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list@example.com/roster/member response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/fritz@example.org", - "delivery_mode": "regular", "email": "fritz@example.org", "http_etag": "\"c6d281ba11803b7706f3f4e34c4f2782db1986c4\"", - "list_id": "open_list.example.com", "member_id": 19, "moderation_action": - "defer", "role": "member", "self_link": "http://localhost:9001/3.0/members/19", - "user": "http://localhost:9001/3.0/users/8"}], "http_etag": "\"4a70bff942603731a25600629b3f5889f9defef2\"", + "delivery_mode": "regular", "email": "fritz@example.org", "http_etag": "\"598305882588045b38f4d1c5b5575ef83d5e8f04\"", + "list_id": "open_list.example.com", "member_id": 1967, "moderation_action": + "defer", "role": "member", "self_link": "http://localhost:9001/3.0/members/1967", + "user": "http://localhost:9001/3.0/users/1281"}], "http_etag": "\"5c46eb1c7bca5bd767726966cc1ca2398c1f6c61\"", "start": 0, "total_size": 1}'} headers: - content-length: ['491'] + content-length: ['498'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list@example.com/requests response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -123,7 +123,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com response: body: {string: !!python/unicode '{"display_name": "Open_list", "fqdn_listname": @@ -139,42 +139,42 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/test@example.com response: body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag": - "\"59457b60648550d547ab9ae2bb5b13e07bf49ac0\"", "is_server_owner": false, - "password": "$6$rounds=718894$GbbWwfOe.L9dZPto$Ls9C/1gapb71bbFgUhI3VJAnuj6kd0Wg0Zoldn9M1JzpoV.kfMtMKo22d/SfgeObEJqAsekEjzdXgz4EXaQ2v.", - "self_link": "http://localhost:9001/3.0/users/8", "user_id": 8}'} + "\"da81fca3ec392848c4d4982758137c81be4d01c6\"", "is_server_owner": false, + "password": "$6$rounds=665366$7snUramcoXLslim1$871ryaBeFZwy7ScDOoWQKYcGtB.M5iAYuHaTknatGb9klolfQWclb/2QcMztjMiSPCJQd2IzmG0oeYURG485k/", + "self_link": "http://localhost:9001/3.0/users/1281", "user_id": 1281}'} headers: - content-length: ['324'] + content-length: ['330'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/users/8/addresses + method: !!python/unicode GET + uri: http://localhost:9001/3.0/users/1281/addresses response: body: {string: !!python/unicode '{"entries": [{"email": "fritz@example.org", "http_etag": - "\"daa00b2c01031e3acab906927ca2edd5b5557399\"", "original_email": "fritz@example.org", + "\"beb2a1f203d47dec4e7e5f00a18b758da558edef\"", "original_email": "fritz@example.org", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/fritz@example.org", - "user": "http://localhost:9001/3.0/users/8", "verified_on": "2005-08-01T07:49:23"}, - {"email": "test@example.com", "http_etag": "\"ddda9833ea38cea61dbf611f3cf46fd118cba777\"", + "user": "http://localhost:9001/3.0/users/1281", "verified_on": "2005-08-01T07:49:23"}, + {"email": "test@example.com", "http_etag": "\"4020be5df6e5fe7a87e4ba961cca9f0d3c81956a\"", "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user": - "http://localhost:9001/3.0/users/8"}], "http_etag": "\"9e159c2ae2863bc8ff50f8475e6cb154967eba0c\"", + "http://localhost:9001/3.0/users/1281"}], "http_etag": "\"334ff06e73cec1d77279303824d1c8e498a6e237\"", "start": 0, "total_size": 2}'} headers: - content-length: ['712'] + content-length: ['718'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com/roster/owner response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -187,7 +187,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com/roster/moderator response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -200,7 +200,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com/member/test@example.com response: body: {string: !!python/unicode '{}'} @@ -212,23 +212,23 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com/member/fritz@example.org response: body: {string: !!python/unicode '{"address": "http://localhost:9001/3.0/addresses/fritz@example.org", - "delivery_mode": "regular", "email": "fritz@example.org", "http_etag": "\"c6d281ba11803b7706f3f4e34c4f2782db1986c4\"", - "list_id": "open_list.example.com", "member_id": 19, "moderation_action": - "defer", "role": "member", "self_link": "http://localhost:9001/3.0/members/19", - "user": "http://localhost:9001/3.0/users/8"}'} + "delivery_mode": "regular", "email": "fritz@example.org", "http_etag": "\"598305882588045b38f4d1c5b5575ef83d5e8f04\"", + "list_id": "open_list.example.com", "member_id": 1967, "moderation_action": + "defer", "role": "member", "self_link": "http://localhost:9001/3.0/members/1967", + "user": "http://localhost:9001/3.0/users/1281"}'} headers: - content-length: ['386'] + content-length: ['393'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_unknown.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_unknown.yaml index a7a911d..678a5a8 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_unknown.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_subscription_unknown.yaml @@ -3,7 +3,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com response: body: {string: !!python/unicode '{"display_name": "Open_list", "fqdn_listname": @@ -19,42 +19,42 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/test@example.com response: body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag": - "\"7db0358da4647276337118a21138c47158ed495f\"", "is_server_owner": false, - "password": "$6$rounds=651014$1WS6cx7zlRMiCSiK$tkm9mUVJZTVx.n2ZS2.L1WcecGUwvFSnfV7US520UyUHlTiD0av/LGsnf.o/EIK4x2pxfxt8bDK2JtwCisve//", - "self_link": "http://localhost:9001/3.0/users/11", "user_id": 11}'} + "\"07c16fe3d9ccee59849e265df292733300037063\"", "is_server_owner": false, + "password": "$6$rounds=716160$iwzGgOb32dfcTeeM$DUBtSOWyh9hBUJy6rvwdNivF2lB801tZYt2N6Ld8AN2EPhSEw/1iMbNxlGfe9jpY1DTw/bTNHh45BscXbWk1O1", + "self_link": "http://localhost:9001/3.0/users/1284", "user_id": 1284}'} headers: - content-length: ['326'] + content-length: ['330'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/users/11/addresses + method: !!python/unicode GET + uri: http://localhost:9001/3.0/users/1284/addresses response: body: {string: !!python/unicode '{"entries": [{"email": "fritz@example.org", "http_etag": - "\"31b39d92c4c510d701a9be2bb097ee4dcbfb4ed9\"", "original_email": "fritz@example.org", + "\"62c6f1bec9a3fe3ac6e59eba16156b14d0ae4677\"", "original_email": "fritz@example.org", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/fritz@example.org", - "user": "http://localhost:9001/3.0/users/11", "verified_on": "2005-08-01T07:49:23"}, - {"email": "test@example.com", "http_etag": "\"c0069cae5d04efb49c7546aef78ce21c4d054047\"", + "user": "http://localhost:9001/3.0/users/1284", "verified_on": "2005-08-01T07:49:23"}, + {"email": "test@example.com", "http_etag": "\"81a0180d9913c6f644dc3381d7fa49497a54ec59\"", "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user": - "http://localhost:9001/3.0/users/11"}], "http_etag": "\"d6c6b521dd9c4c6dc1d7bba4c0140496279002f8\"", + "http://localhost:9001/3.0/users/1284"}], "http_etag": "\"ebadc6d48fd3bacd6172472667662bec2fb6409b\"", "start": 0, "total_size": 2}'} headers: - content-length: ['714'] + content-length: ['718'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com/roster/owner response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -67,7 +67,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com/roster/moderator response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -80,7 +80,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list@example.com/roster/member response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -93,7 +93,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list@example.com/requests response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -106,7 +106,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com response: body: {string: !!python/unicode '{"display_name": "Open_list", "fqdn_listname": @@ -122,42 +122,42 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/test@example.com response: body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag": - "\"7db0358da4647276337118a21138c47158ed495f\"", "is_server_owner": false, - "password": "$6$rounds=651014$1WS6cx7zlRMiCSiK$tkm9mUVJZTVx.n2ZS2.L1WcecGUwvFSnfV7US520UyUHlTiD0av/LGsnf.o/EIK4x2pxfxt8bDK2JtwCisve//", - "self_link": "http://localhost:9001/3.0/users/11", "user_id": 11}'} + "\"07c16fe3d9ccee59849e265df292733300037063\"", "is_server_owner": false, + "password": "$6$rounds=716160$iwzGgOb32dfcTeeM$DUBtSOWyh9hBUJy6rvwdNivF2lB801tZYt2N6Ld8AN2EPhSEw/1iMbNxlGfe9jpY1DTw/bTNHh45BscXbWk1O1", + "self_link": "http://localhost:9001/3.0/users/1284", "user_id": 1284}'} headers: - content-length: ['326'] + content-length: ['330'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/users/11/addresses + method: !!python/unicode GET + uri: http://localhost:9001/3.0/users/1284/addresses response: body: {string: !!python/unicode '{"entries": [{"email": "fritz@example.org", "http_etag": - "\"31b39d92c4c510d701a9be2bb097ee4dcbfb4ed9\"", "original_email": "fritz@example.org", + "\"62c6f1bec9a3fe3ac6e59eba16156b14d0ae4677\"", "original_email": "fritz@example.org", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/fritz@example.org", - "user": "http://localhost:9001/3.0/users/11", "verified_on": "2005-08-01T07:49:23"}, - {"email": "test@example.com", "http_etag": "\"c0069cae5d04efb49c7546aef78ce21c4d054047\"", + "user": "http://localhost:9001/3.0/users/1284", "verified_on": "2005-08-01T07:49:23"}, + {"email": "test@example.com", "http_etag": "\"81a0180d9913c6f644dc3381d7fa49497a54ec59\"", "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/test@example.com", "user": - "http://localhost:9001/3.0/users/11"}], "http_etag": "\"d6c6b521dd9c4c6dc1d7bba4c0140496279002f8\"", + "http://localhost:9001/3.0/users/1284"}], "http_etag": "\"ebadc6d48fd3bacd6172472667662bec2fb6409b\"", "start": 0, "total_size": 2}'} headers: - content-length: ['714'] + content-length: ['718'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com/roster/owner response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -170,7 +170,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com/roster/moderator response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -183,7 +183,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com/member/test@example.com response: body: {string: !!python/unicode '{}'} @@ -195,7 +195,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list.example.com/member/fritz@example.org response: body: {string: !!python/unicode '{}'} @@ -207,7 +207,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/open_list@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary.yaml index a703e9e..51bd2ea 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary.yaml @@ -3,35 +3,20 @@ body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -46,8 +31,8 @@ body: fqdn_listname=foo%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -59,7 +44,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode '{"entries": [{"display_name": "Foo", "fqdn_listname": @@ -76,7 +61,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode ''} @@ -87,37 +72,29 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users response: body: {string: !!python/unicode '{"entries": [{"created_on": "2005-08-01T07:49:23", - "http_etag": "\"eb591d9720aa0ac944b49315b6af1c950410b54c\"", "is_server_owner": - false, "self_link": "http://localhost:9001/3.0/users/1", "user_id": 1}, {"created_on": - "2005-08-01T07:49:23", "http_etag": "\"b36f8ca1d91d583901c768dc116815282d469c66\"", - "is_server_owner": false, "self_link": "http://localhost:9001/3.0/users/2", - "user_id": 2}, {"created_on": "2005-08-01T07:49:23", "http_etag": "\"bb1c2e6094a96b17e2d5dbf487291f7667f69f75\"", - "is_server_owner": false, "self_link": "http://localhost:9001/3.0/users/3", - "user_id": 3}, {"created_on": "2005-08-01T07:49:23", "http_etag": "\"c1dcbf16536eb2e2151441f4bce2989ab1dab30b\"", - "is_server_owner": false, "self_link": "http://localhost:9001/3.0/users/4", - "user_id": 4}, {"created_on": "2005-08-01T07:49:23", "http_etag": "\"637c12d15eb0203c9ffac9ea2d5ac8605d18e38d\"", - "is_server_owner": false, "self_link": "http://localhost:9001/3.0/users/5", - "user_id": 5}, {"created_on": "2005-08-01T07:49:23", "http_etag": "\"b774d488fd2356b7bedf0e6fa4a26dc70dc2b02b\"", - "is_server_owner": false, "self_link": "http://localhost:9001/3.0/users/6", - "user_id": 6}, {"created_on": "2005-08-01T07:49:23", "display_name": "None", - "http_etag": "\"190a72468798ef5f7c51a5e73125abc76e61824a\"", "is_server_owner": - false, "self_link": "http://localhost:9001/3.0/users/12", "user_id": 12}], - "http_etag": "\"c5b0a2670ed8edbdb168566a5b22bdfa2bd2faca\"", "start": 0, "total_size": - 7}'} + "http_etag": "\"04f62e7d955f8957478df966ffe3cd3295a44b12\"", "is_server_owner": + false, "self_link": "http://localhost:9001/3.0/users/1292", "user_id": 1292}, + {"created_on": "2005-08-01T07:49:23", "http_etag": "\"65d8b6ad97e078c1e2e8a63169e1984f9cf3207b\"", + "is_server_owner": false, "self_link": "http://localhost:9001/3.0/users/1293", + "user_id": 1293}, {"created_on": "2005-08-01T07:49:23", "display_name": "None", + "http_etag": "\"364d24378962e6605727378714933f5621bf78bf\"", "is_server_owner": + false, "self_link": "http://localhost:9001/3.0/users/1294", "user_id": 1294}], + "http_etag": "\"787f878a0b1374b1101dd6f73dbc1fa9e1b1bc29\"", "start": 0, "total_size": + 3}'} headers: - content-length: ['1459'] + content-length: ['715'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' - uri: http://localhost:9001/3.0/users/1 + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/users/1292 response: body: {string: !!python/unicode ''} headers: @@ -127,8 +104,8 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' - uri: http://localhost:9001/3.0/users/12 + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/users/1293 response: body: {string: !!python/unicode ''} headers: @@ -138,8 +115,8 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' - uri: http://localhost:9001/3.0/users/2 + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/users/1294 response: body: {string: !!python/unicode ''} headers: @@ -149,41 +126,8 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' - uri: http://localhost:9001/3.0/users/3 - response: - body: {string: !!python/unicode ''} - headers: - content-length: ['0'] - status: {code: 204, message: No Content} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' - uri: http://localhost:9001/3.0/users/4 - response: - body: {string: !!python/unicode ''} - headers: - content-length: ['0'] - status: {code: 204, message: No Content} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' - uri: http://localhost:9001/3.0/users/5 - response: - body: {string: !!python/unicode ''} - headers: - content-length: ['0'] - status: {code: 204, message: No Content} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' - uri: http://localhost:9001/3.0/users/6 + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode ''} headers: @@ -193,35 +137,20 @@ body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -236,8 +165,8 @@ body: fqdn_listname=foo%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -249,7 +178,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode '{"entries": [{"display_name": "Foo", "fqdn_listname": @@ -266,7 +195,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode ''} @@ -277,24 +206,35 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users response: body: {string: !!python/unicode '{"entries": [{"created_on": "2005-08-01T07:49:23", - "http_etag": "\"007cc78d77622058dc0f70458877d09487378a12\"", "is_server_owner": - false, "self_link": "http://localhost:9001/3.0/users/13", "user_id": 13}], - "http_etag": "\"cf0f619803e6e86366c5f8164b727b2c220bb803\"", "start": 0, "total_size": + "http_etag": "\"4c0c75d51847868a3652d775c93fbe7136bf41a0\"", "is_server_owner": + false, "self_link": "http://localhost:9001/3.0/users/1295", "user_id": 1295}], + "http_etag": "\"a3c24d3e1fc7ab136682eb9966c0fd9ffc226734\"", "start": 0, "total_size": 1}'} headers: - content-length: ['295'] + content-length: ['299'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' - uri: http://localhost:9001/3.0/users/13 + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/users/1295 + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode ''} headers: @@ -304,35 +244,20 @@ body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -347,8 +272,8 @@ body: fqdn_listname=foo%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -360,7 +285,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode '{"entries": [{"display_name": "Foo", "fqdn_listname": @@ -377,7 +302,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode ''} @@ -388,7 +313,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -398,38 +323,34 @@ content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -444,8 +365,8 @@ body: fqdn_listname=foo%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -457,7 +378,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode '{"entries": [{"display_name": "Foo", "fqdn_listname": @@ -474,7 +395,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode ''} @@ -485,24 +406,35 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users response: body: {string: !!python/unicode '{"entries": [{"created_on": "2005-08-01T07:49:23", - "http_etag": "\"0151e0193b20e2c0ad85bb8486f2147bea762806\"", "is_server_owner": - false, "self_link": "http://localhost:9001/3.0/users/14", "user_id": 14}], - "http_etag": "\"a2e6bd1bff4ed16bf6266c9576da03906be66199\"", "start": 0, "total_size": + "http_etag": "\"4e34688b92fe421f2442b9819987dc27f39a637c\"", "is_server_owner": + false, "self_link": "http://localhost:9001/3.0/users/1296", "user_id": 1296}], + "http_etag": "\"55eadb7de9ab02291e613b3d906e2e9857ca5811\"", "start": 0, "total_size": 1}'} headers: - content-length: ['295'] + content-length: ['299'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' - uri: http://localhost:9001/3.0/users/14 + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/users/1296 + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode ''} headers: @@ -512,35 +444,20 @@ body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -555,8 +472,8 @@ body: fqdn_listname=foo%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -568,7 +485,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode '{"entries": [{"display_name": "Foo", "fqdn_listname": @@ -585,7 +502,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode ''} @@ -596,25 +513,36 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users response: body: {string: !!python/unicode '{"entries": [{"created_on": "2005-08-01T07:49:23", - "http_etag": "\"a531627473d3c42f839df72e1179d6fb7416c340\"", "is_server_owner": - false, "password": "$6$rounds=716038$rjFuMqcGBhC9Af.V$E.MKJZz6EAd5gZeB.0HNDItwVINNxQD4ZU/r8QLLhuyL6G.KEaYxFF7QrtNPKQDfvBg8GMD/THlLhDekZFegn/", - "self_link": "http://localhost:9001/3.0/users/15", "user_id": 15}], "http_etag": - "\"c86f65db990cbb218aa9d5dd07f5e2a5b364ca26\"", "start": 0, "total_size": + "http_etag": "\"4b9ab8ce6037e115e2a4192eb07773aaea396d91\"", "is_server_owner": + false, "password": "$6$rounds=662267$8otqupHMgcXivGG9$PL.qGYnboHQwQ5MewIZ8DqIrOcb1xu5zUkLdCcLhRCj3PzdwkwwFyorFabOU1TwASLYLfthzEegdI8cUZFoUE0", + "self_link": "http://localhost:9001/3.0/users/1297", "user_id": 1297}], "http_etag": + "\"48d627eee9c0c16245ba10e2104768826280c28f\"", "start": 0, "total_size": 1}'} headers: - content-length: ['431'] + content-length: ['435'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' - uri: http://localhost:9001/3.0/users/15 + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/users/1297 + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode ''} headers: @@ -624,35 +552,20 @@ body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -667,8 +580,8 @@ body: fqdn_listname=foo%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -680,7 +593,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode '{"entries": [{"display_name": "Foo", "fqdn_listname": @@ -697,7 +610,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode ''} @@ -708,25 +621,36 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users response: body: {string: !!python/unicode '{"entries": [{"created_on": "2005-08-01T07:49:23", - "http_etag": "\"a7c0d6889f70b59a124905d4c7c7111b11551ca3\"", "is_server_owner": - false, "password": "$6$rounds=702281$U/3ZLVUTudSZLlZH$LrA9kL0T57Lr8GSs6RS4ZAE5vgr8upiAqhnVz.lXvZbn8tMbUz/VpyG9xfSkLvv3BqIzlZIu6mpaczTPlmeRc/", - "self_link": "http://localhost:9001/3.0/users/16", "user_id": 16}], "http_etag": - "\"da82cd93a4a5c06a93ea27699ef44fe13900fdb4\"", "start": 0, "total_size": + "http_etag": "\"53c1c3019e005cfb50dd7397e1483498d4018a74\"", "is_server_owner": + false, "password": "$6$rounds=649705$gGnX160MBIKhAs8w$D0o.zYoLG7I0TbOShTcPoxBYQ67o1vLDwUUYoIBkF/jXkA9XJSZlMhaPQlesUJl2pZQLQghDcAodMYf5rmZQB/", + "self_link": "http://localhost:9001/3.0/users/1298", "user_id": 1298}], "http_etag": + "\"cd4806d7931e31a34665e613aedab951977dc484\"", "start": 0, "total_size": 1}'} headers: - content-length: ['431'] + content-length: ['435'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' - uri: http://localhost:9001/3.0/users/16 + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/users/1298 + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode ''} headers: @@ -736,35 +660,20 @@ body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -779,8 +688,8 @@ body: fqdn_listname=foo%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -792,7 +701,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -807,10 +716,10 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/test@example.com response: - body: {string: !!python/unicode '404 Not Found'} + body: {string: !!python/unicode 404 Not Found} headers: content-length: ['13'] content-type: [application/json; charset=utf-8] @@ -819,7 +728,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -832,7 +741,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/moderator response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -845,7 +754,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/member/test@example.com response: body: {string: !!python/unicode '{}'} @@ -857,7 +766,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": @@ -888,7 +797,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode '{"entries": [{"display_name": "Foo", "fqdn_listname": @@ -905,7 +814,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode ''} @@ -916,7 +825,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -926,38 +835,34 @@ content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -972,8 +877,8 @@ body: fqdn_listname=foo%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -985,7 +890,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -1000,7 +905,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": @@ -1031,7 +936,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode '{"entries": [{"display_name": "Foo", "fqdn_listname": @@ -1048,7 +953,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode ''} @@ -1059,7 +964,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -1069,38 +974,34 @@ content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -1115,8 +1016,8 @@ body: fqdn_listname=foo%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -1128,7 +1029,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode '{"entries": [{"display_name": "Foo", "fqdn_listname": @@ -1145,7 +1046,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode ''} @@ -1156,25 +1057,36 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users response: body: {string: !!python/unicode '{"entries": [{"created_on": "2005-08-01T07:49:23", - "http_etag": "\"fe30bde1bb1f2782618c013e4d84fd01f2be77ed\"", "is_server_owner": - false, "password": "$6$rounds=599671$reIkEyBqsvnMS5ns$npdWKphARj.nzK7kulwvYoJ5JGnR7FNPVoDET14UCNeuU7SEzGwOerbz4/4vFl5UazVF/0uQhwdJB//R0sBMh1", - "self_link": "http://localhost:9001/3.0/users/17", "user_id": 17}], "http_etag": - "\"fd68f4a41dbd2c54b54ae737bef732d47cc7ee79\"", "start": 0, "total_size": + "http_etag": "\"eb2fefc60af48e4c2c503926b7f5e0dd19753beb\"", "is_server_owner": + false, "password": "$6$rounds=661841$AQbebehLIFgVwRLG$9t/G50GwA5WQePUEOaPRRL0XnFCUTc3w7Xfc2HoUBI//APzcWYmipOHLjXsbrcy6lK/wqcROuIpScs6vQSTS10", + "self_link": "http://localhost:9001/3.0/users/1299", "user_id": 1299}], "http_etag": + "\"45a0f7d51b7051573a99c07d14e02531e3ee5815\"", "start": 0, "total_size": 1}'} headers: - content-length: ['431'] + content-length: ['435'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' - uri: http://localhost:9001/3.0/users/17 + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/users/1299 + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode ''} headers: @@ -1184,35 +1096,20 @@ body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -1227,8 +1124,8 @@ body: fqdn_listname=foo%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -1240,7 +1137,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode '{"entries": [{"display_name": "Foo", "fqdn_listname": @@ -1257,7 +1154,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode ''} @@ -1268,25 +1165,36 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users response: body: {string: !!python/unicode '{"entries": [{"created_on": "2005-08-01T07:49:23", - "http_etag": "\"4069f0666f269c69537d6ad2ece8e3eaec6882b3\"", "is_server_owner": - false, "password": "$6$rounds=671105$BC4rSNHWy/JkJfj8$HcwNXekuZ462tp5hnP3hVVtNVvyzn8JCcTynIJjDHIqV.62XlQlhMRPh7J/3AOOevu8PME9oJmRM1i/.XYa8x0", - "self_link": "http://localhost:9001/3.0/users/18", "user_id": 18}], "http_etag": - "\"e6885c4aa47cf60a17d00320b22db0b52dad2cfc\"", "start": 0, "total_size": + "http_etag": "\"436ba78df608edc4844f4cecb072f770f0d3e32a\"", "is_server_owner": + false, "password": "$6$rounds=710974$zPwPBBSA/ofbubU9$2sJuOq8zWqdnGOON0zjvTptaIUMlQCcDfLjus9Sw9rm5iaUkbP/tbMhZtZTKfBhnoDZcC/v9qyEays4ueoSQO0", + "self_link": "http://localhost:9001/3.0/users/1300", "user_id": 1300}], "http_etag": + "\"47bc65e7071e472e56d5d2657e88c2d023da5271\"", "start": 0, "total_size": 1}'} headers: - content-length: ['431'] + content-length: ['435'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' - uri: http://localhost:9001/3.0/users/18 + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/users/1300 + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode ''} headers: @@ -1296,35 +1204,20 @@ body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -1339,8 +1232,8 @@ body: fqdn_listname=foo%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -1352,7 +1245,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode '{"entries": [{"display_name": "Foo", "fqdn_listname": @@ -1369,7 +1262,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode ''} @@ -1380,24 +1273,35 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users response: body: {string: !!python/unicode '{"entries": [{"created_on": "2005-08-01T07:49:23", - "display_name": "None", "http_etag": "\"738b16aa5f336bcbf244014d98535f24da52fc42\"", - "is_server_owner": false, "self_link": "http://localhost:9001/3.0/users/19", - "user_id": 19}], "http_etag": "\"f8be718493c688b61de62c673cfb89e74188f61a\"", + "display_name": "None", "http_etag": "\"634a6cd7b39bfae9ec2f1b738564a17505b55cf9\"", + "is_server_owner": false, "self_link": "http://localhost:9001/3.0/users/1301", + "user_id": 1301}], "http_etag": "\"0b53e7421a7b1c3f9165a063715dae37d4c60415\"", "start": 0, "total_size": 1}'} headers: - content-length: ['319'] + content-length: ['323'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' - uri: http://localhost:9001/3.0/users/19 + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/users/1301 + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode ''} headers: @@ -1407,35 +1311,20 @@ body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -1450,8 +1339,8 @@ body: fqdn_listname=foo%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -1463,7 +1352,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode '{"entries": [{"display_name": "Foo", "fqdn_listname": @@ -1480,7 +1369,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode ''} @@ -1491,7 +1380,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -1500,4 +1389,15 @@ content-length: ['90'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} version: 1 diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_metrics_anonymous.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_metrics_anonymous.yaml index bc481a7..2e723bc 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_metrics_anonymous.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_metrics_anonymous.yaml @@ -3,7 +3,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -18,7 +18,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_metrics_moderator.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_metrics_moderator.yaml index f023ff2..f3bba8f 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_metrics_moderator.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_metrics_moderator.yaml @@ -3,7 +3,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -18,20 +18,20 @@ body: list_id=foo.example.com&role=moderator&subscriber=test%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/23'] + location: ['http://localhost:9001/3.0/members/2000'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -46,37 +46,37 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/test@example.com response: body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag": - "\"0151e0193b20e2c0ad85bb8486f2147bea762806\"", "is_server_owner": false, - "self_link": "http://localhost:9001/3.0/users/14", "user_id": 14}'} + "\"4e34688b92fe421f2442b9819987dc27f39a637c\"", "is_server_owner": false, + "self_link": "http://localhost:9001/3.0/users/1296", "user_id": 1296}'} headers: - content-length: ['190'] + content-length: ['194'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/users/14/addresses + method: !!python/unicode GET + uri: http://localhost:9001/3.0/users/1296/addresses response: body: {string: !!python/unicode '{"entries": [{"email": "test@example.com", "http_etag": - "\"6c39fd341eea07279f00e7cd3cd0ecd501bc0cec\"", "original_email": "test@example.com", + "\"616f3091b63c08b23a7f68f2b22ed2c04ffc7353\"", "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/test@example.com", - "user": "http://localhost:9001/3.0/users/14"}], "http_etag": "\"90fbccbf73f5e633883d07ed7e6b4f1f1217a341\"", + "user": "http://localhost:9001/3.0/users/1296"}], "http_etag": "\"b0559e29dfc8816c864095b8c8e52dfdee4f3ccb\"", "start": 0, "total_size": 1}'} headers: - content-length: ['388'] + content-length: ['390'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -89,24 +89,24 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/moderator response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/test@example.com", - "delivery_mode": "regular", "email": "test@example.com", "http_etag": "\"9f6a5f41233b2b3a08304f24834dc512521016ec\"", - "list_id": "foo.example.com", "member_id": 23, "moderation_action": "accept", - "role": "moderator", "self_link": "http://localhost:9001/3.0/members/23", - "user": "http://localhost:9001/3.0/users/14"}], "http_etag": "\"0377e222bb75fa384244fdc347dd0a6bde58b89f\"", + "delivery_mode": "regular", "email": "test@example.com", "http_etag": "\"9450306983a92d0877cc4fbfdf09cfc1f779b345\"", + "list_id": "foo.example.com", "member_id": 2000, "moderation_action": "accept", + "role": "moderator", "self_link": "http://localhost:9001/3.0/members/2000", + "user": "http://localhost:9001/3.0/users/1296"}], "http_etag": "\"32e3930836a5394935aae4a757307adc538f34ae\"", "start": 0, "total_size": 1}'} headers: - content-length: ['488'] + content-length: ['494'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/member/test@example.com response: body: {string: !!python/unicode '{}'} @@ -118,7 +118,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_metrics_owner.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_metrics_owner.yaml index ac8fee1..1a1ae8d 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_metrics_owner.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_metrics_owner.yaml @@ -3,7 +3,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -18,20 +18,20 @@ body: list_id=foo.example.com&role=owner&subscriber=test%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/22'] + location: ['http://localhost:9001/3.0/members/1999'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -46,54 +46,54 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/test@example.com response: body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag": - "\"007cc78d77622058dc0f70458877d09487378a12\"", "is_server_owner": false, - "self_link": "http://localhost:9001/3.0/users/13", "user_id": 13}'} + "\"4c0c75d51847868a3652d775c93fbe7136bf41a0\"", "is_server_owner": false, + "self_link": "http://localhost:9001/3.0/users/1295", "user_id": 1295}'} headers: - content-length: ['190'] + content-length: ['194'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/users/13/addresses + method: !!python/unicode GET + uri: http://localhost:9001/3.0/users/1295/addresses response: body: {string: !!python/unicode '{"entries": [{"email": "test@example.com", "http_etag": - "\"183bd2070dec2c1087e072dede15f46d64ad4c23\"", "original_email": "test@example.com", + "\"321f1b6c758f97bd6d8e56e7304bc2d6f36f658b\"", "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/test@example.com", - "user": "http://localhost:9001/3.0/users/13"}], "http_etag": "\"b92fe879e91887ed2a5e9d8fbbfa1d827c984395\"", + "user": "http://localhost:9001/3.0/users/1295"}], "http_etag": "\"7bd090b0b681e52143f55f1dff1efa68afae86f3\"", "start": 0, "total_size": 1}'} headers: - content-length: ['388'] + content-length: ['390'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/test@example.com", - "delivery_mode": "regular", "email": "test@example.com", "http_etag": "\"64f58f14a248d5b83adf04e579c1ff31d1c721b0\"", - "list_id": "foo.example.com", "member_id": 22, "moderation_action": "accept", - "role": "owner", "self_link": "http://localhost:9001/3.0/members/22", "user": - "http://localhost:9001/3.0/users/13"}], "http_etag": "\"a17691c68c5f0895492fc34cbff26cb7172dd794\"", + "delivery_mode": "regular", "email": "test@example.com", "http_etag": "\"9193f1e2dc805920e16f777878f8c00f79c7496a\"", + "list_id": "foo.example.com", "member_id": 1999, "moderation_action": "accept", + "role": "owner", "self_link": "http://localhost:9001/3.0/members/1999", "user": + "http://localhost:9001/3.0/users/1295"}], "http_etag": "\"3323ce03440a2e3c89027f9b25d03e2e586cb535\"", "start": 0, "total_size": 1}'} headers: - content-length: ['484'] + content-length: ['490'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/moderator response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -106,7 +106,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/member/test@example.com response: body: {string: !!python/unicode '{}'} @@ -118,7 +118,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_metrics_superuser.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_metrics_superuser.yaml index 163b223..2749ff3 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_metrics_superuser.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_metrics_superuser.yaml @@ -3,7 +3,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -18,7 +18,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -33,10 +33,10 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/testadmin@example.com response: - body: {string: !!python/unicode '404 Not Found'} + body: {string: !!python/unicode 404 Not Found} headers: content-length: ['13'] content-type: [application/json; charset=utf-8] @@ -45,7 +45,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -58,7 +58,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/moderator response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -71,7 +71,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/member/testadmin@example.com response: body: {string: !!python/unicode '{}'} @@ -83,7 +83,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_moderator.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_moderator.yaml index 92491d6..d3167c4 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_moderator.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_moderator.yaml @@ -3,20 +3,20 @@ body: email=test%40example.com&password=None headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/users response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/users/17'] + location: ['http://localhost:9001/3.0/users/1299'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -31,20 +31,20 @@ body: list_id=foo.example.com&role=moderator&subscriber=test%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/26'] + location: ['http://localhost:9001/3.0/members/2003'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -59,38 +59,38 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/test@example.com response: body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag": - "\"fe30bde1bb1f2782618c013e4d84fd01f2be77ed\"", "is_server_owner": false, - "password": "$6$rounds=599671$reIkEyBqsvnMS5ns$npdWKphARj.nzK7kulwvYoJ5JGnR7FNPVoDET14UCNeuU7SEzGwOerbz4/4vFl5UazVF/0uQhwdJB//R0sBMh1", - "self_link": "http://localhost:9001/3.0/users/17", "user_id": 17}'} + "\"eb2fefc60af48e4c2c503926b7f5e0dd19753beb\"", "is_server_owner": false, + "password": "$6$rounds=661841$AQbebehLIFgVwRLG$9t/G50GwA5WQePUEOaPRRL0XnFCUTc3w7Xfc2HoUBI//APzcWYmipOHLjXsbrcy6lK/wqcROuIpScs6vQSTS10", + "self_link": "http://localhost:9001/3.0/users/1299", "user_id": 1299}'} headers: - content-length: ['326'] + content-length: ['330'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/users/17/addresses + method: !!python/unicode GET + uri: http://localhost:9001/3.0/users/1299/addresses response: body: {string: !!python/unicode '{"entries": [{"email": "test@example.com", "http_etag": - "\"728b0a651f28a9aef0690432eb539012aa4c130d\"", "original_email": "test@example.com", + "\"db5ac1011300f4338032c89c733b8b6aff9cc55a\"", "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/test@example.com", - "user": "http://localhost:9001/3.0/users/17"}], "http_etag": "\"88559b648e3cb3ad6fbc75e13dbd37b318e5aa20\"", + "user": "http://localhost:9001/3.0/users/1299"}], "http_etag": "\"56b8a48142fe1137a1095d12d8cb760ee32ed813\"", "start": 0, "total_size": 1}'} headers: - content-length: ['388'] + content-length: ['390'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -103,24 +103,24 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/moderator response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/test@example.com", - "delivery_mode": "regular", "email": "test@example.com", "http_etag": "\"ba42b60bf5bb3cd9e832f3127571f0e2b9220e92\"", - "list_id": "foo.example.com", "member_id": 26, "moderation_action": "accept", - "role": "moderator", "self_link": "http://localhost:9001/3.0/members/26", - "user": "http://localhost:9001/3.0/users/17"}], "http_etag": "\"77869b6698e9136d2b38ad174c87c7fa3933a59c\"", + "delivery_mode": "regular", "email": "test@example.com", "http_etag": "\"b9a9bcf7b527a8764c7a0c010e132dc942d08509\"", + "list_id": "foo.example.com", "member_id": 2003, "moderation_action": "accept", + "role": "moderator", "self_link": "http://localhost:9001/3.0/members/2003", + "user": "http://localhost:9001/3.0/users/1299"}], "http_etag": "\"4cb703edd9ae4192d4f40173084b78888e9ac620\"", "start": 0, "total_size": 1}'} headers: - content-length: ['488'] + content-length: ['494'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/member/test@example.com response: body: {string: !!python/unicode '{}'} @@ -132,7 +132,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_owner.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_owner.yaml index 398333a..8e35ace 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_owner.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_owner.yaml @@ -3,20 +3,20 @@ body: email=test%40example.com&password=None headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/users response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/users/18'] + location: ['http://localhost:9001/3.0/users/1300'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -31,20 +31,20 @@ body: list_id=foo.example.com&role=owner&subscriber=test%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/27'] + location: ['http://localhost:9001/3.0/members/2004'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -59,55 +59,55 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/test@example.com response: body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag": - "\"4069f0666f269c69537d6ad2ece8e3eaec6882b3\"", "is_server_owner": false, - "password": "$6$rounds=671105$BC4rSNHWy/JkJfj8$HcwNXekuZ462tp5hnP3hVVtNVvyzn8JCcTynIJjDHIqV.62XlQlhMRPh7J/3AOOevu8PME9oJmRM1i/.XYa8x0", - "self_link": "http://localhost:9001/3.0/users/18", "user_id": 18}'} + "\"436ba78df608edc4844f4cecb072f770f0d3e32a\"", "is_server_owner": false, + "password": "$6$rounds=710974$zPwPBBSA/ofbubU9$2sJuOq8zWqdnGOON0zjvTptaIUMlQCcDfLjus9Sw9rm5iaUkbP/tbMhZtZTKfBhnoDZcC/v9qyEays4ueoSQO0", + "self_link": "http://localhost:9001/3.0/users/1300", "user_id": 1300}'} headers: - content-length: ['326'] + content-length: ['330'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/users/18/addresses + method: !!python/unicode GET + uri: http://localhost:9001/3.0/users/1300/addresses response: body: {string: !!python/unicode '{"entries": [{"email": "test@example.com", "http_etag": - "\"c15852aab181b68acbd442056b76d5dd8a6daa16\"", "original_email": "test@example.com", + "\"3247e1f838cd6755a4c1c0f79de12a497526ff85\"", "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/test@example.com", - "user": "http://localhost:9001/3.0/users/18"}], "http_etag": "\"8cf4f4b24629be22ab8c1244fb152274d892955f\"", + "user": "http://localhost:9001/3.0/users/1300"}], "http_etag": "\"7f70efd9761ce4fe985deaf1b7a578bb002341d4\"", "start": 0, "total_size": 1}'} headers: - content-length: ['388'] + content-length: ['390'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/test@example.com", - "delivery_mode": "regular", "email": "test@example.com", "http_etag": "\"37346f477cc22009038f126cfd0c9b8f50e631e5\"", - "list_id": "foo.example.com", "member_id": 27, "moderation_action": "accept", - "role": "owner", "self_link": "http://localhost:9001/3.0/members/27", "user": - "http://localhost:9001/3.0/users/18"}], "http_etag": "\"a4e634794c1277f36847e01ee9dd417fbb1852cf\"", + "delivery_mode": "regular", "email": "test@example.com", "http_etag": "\"8d4117e3eb8ba6a3fc6b5b2ad83653963138949c\"", + "list_id": "foo.example.com", "member_id": 2004, "moderation_action": "accept", + "role": "owner", "self_link": "http://localhost:9001/3.0/members/2004", "user": + "http://localhost:9001/3.0/users/1300"}], "http_etag": "\"943b01a7d8546b5e4361f6cdd389b142b0b17360\"", "start": 0, "total_size": 1}'} headers: - content-length: ['484'] + content-length: ['490'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/moderator response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -120,7 +120,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/member/test@example.com response: body: {string: !!python/unicode '{}'} @@ -132,7 +132,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_secondary_moderator.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_secondary_moderator.yaml index 654cc4b..c93bf2b 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_secondary_moderator.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_secondary_moderator.yaml @@ -3,22 +3,22 @@ body: email=test%40example.com&password=None headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/users response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/users/15'] + location: ['http://localhost:9001/3.0/users/1297'] status: {code: 201, message: Created} - request: body: email=anotheremail%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' - uri: http://localhost:9001/3.0/users/15/addresses + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/users/1297/addresses response: body: {string: !!python/unicode ''} headers: @@ -29,7 +29,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'POST' + method: !!python/unicode POST uri: http://localhost:9001/3.0/addresses/anotheremail@example.com/verify response: body: {string: !!python/unicode ''} @@ -40,7 +40,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -55,20 +55,20 @@ body: list_id=foo.example.com&role=moderator&subscriber=anotheremail%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/24'] + location: ['http://localhost:9001/3.0/members/2001'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -83,42 +83,42 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/test@example.com response: body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag": - "\"a531627473d3c42f839df72e1179d6fb7416c340\"", "is_server_owner": false, - "password": "$6$rounds=716038$rjFuMqcGBhC9Af.V$E.MKJZz6EAd5gZeB.0HNDItwVINNxQD4ZU/r8QLLhuyL6G.KEaYxFF7QrtNPKQDfvBg8GMD/THlLhDekZFegn/", - "self_link": "http://localhost:9001/3.0/users/15", "user_id": 15}'} + "\"4b9ab8ce6037e115e2a4192eb07773aaea396d91\"", "is_server_owner": false, + "password": "$6$rounds=662267$8otqupHMgcXivGG9$PL.qGYnboHQwQ5MewIZ8DqIrOcb1xu5zUkLdCcLhRCj3PzdwkwwFyorFabOU1TwASLYLfthzEegdI8cUZFoUE0", + "self_link": "http://localhost:9001/3.0/users/1297", "user_id": 1297}'} headers: - content-length: ['326'] + content-length: ['330'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/users/15/addresses + method: !!python/unicode GET + uri: http://localhost:9001/3.0/users/1297/addresses response: body: {string: !!python/unicode '{"entries": [{"email": "anotheremail@example.com", - "http_etag": "\"d652d3593551672385cb4c02a31cf9401c4134e7\"", "original_email": + "http_etag": "\"797856f25f3d545b5b56ae9711f70023a0c87412\"", "original_email": "anotheremail@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": - "http://localhost:9001/3.0/addresses/anotheremail@example.com", "user": "http://localhost:9001/3.0/users/15", + "http://localhost:9001/3.0/addresses/anotheremail@example.com", "user": "http://localhost:9001/3.0/users/1297", "verified_on": "2005-08-01T07:49:23"}, {"email": "test@example.com", "http_etag": - "\"7e89118330bb8d4cfca6242e4023e3685cfe802f\"", "original_email": "test@example.com", + "\"7587a54322ed9fc0eb619cda0910be590835c3fd\"", "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/test@example.com", - "user": "http://localhost:9001/3.0/users/15"}], "http_etag": "\"95484b203d290a29d170d1e82e3c5ca4b739af2b\"", + "user": "http://localhost:9001/3.0/users/1297"}], "http_etag": "\"3323543051215ffe66929af18cbc1b4991082e43\"", "start": 0, "total_size": 2}'} headers: - content-length: ['735'] + content-length: ['739'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -131,25 +131,25 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/moderator response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/anotheremail@example.com", "delivery_mode": "regular", "email": "anotheremail@example.com", "http_etag": - "\"ac12bc386cbb249aee842f645081dc55675b9ec2\"", "list_id": "foo.example.com", - "member_id": 24, "moderation_action": "accept", "role": "moderator", "self_link": - "http://localhost:9001/3.0/members/24", "user": "http://localhost:9001/3.0/users/15"}], - "http_etag": "\"80ca948f5fc0981743fc8c4e6d5c80b3d835950c\"", "start": 0, "total_size": + "\"6d2f06ba817f776f463dced4265c89ecfe19e6c4\"", "list_id": "foo.example.com", + "member_id": 2001, "moderation_action": "accept", "role": "moderator", "self_link": + "http://localhost:9001/3.0/members/2001", "user": "http://localhost:9001/3.0/users/1297"}], + "http_etag": "\"973f708b05a4e55a1244421e3a7a407db6b74ef4\"", "start": 0, "total_size": 1}'} headers: - content-length: ['504'] + content-length: ['510'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/member/test@example.com response: body: {string: !!python/unicode '{}'} @@ -161,7 +161,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/member/anotheremail@example.com response: body: {string: !!python/unicode '{}'} @@ -173,7 +173,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_secondary_owner.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_secondary_owner.yaml index dfe6ab4..aa74997 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_secondary_owner.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_list_summary_secondary_owner.yaml @@ -3,22 +3,22 @@ body: email=test%40example.com&password=None headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/users response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/users/16'] + location: ['http://localhost:9001/3.0/users/1298'] status: {code: 201, message: Created} - request: body: email=anotheremail%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' - uri: http://localhost:9001/3.0/users/16/addresses + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST + uri: http://localhost:9001/3.0/users/1298/addresses response: body: {string: !!python/unicode ''} headers: @@ -29,7 +29,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'POST' + method: !!python/unicode POST uri: http://localhost:9001/3.0/addresses/anotheremail@example.com/verify response: body: {string: !!python/unicode ''} @@ -40,7 +40,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -55,20 +55,20 @@ body: list_id=foo.example.com&role=owner&subscriber=anotheremail%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/members response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/members/25'] + location: ['http://localhost:9001/3.0/members/2002'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com", @@ -83,60 +83,60 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/test@example.com response: body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag": - "\"a7c0d6889f70b59a124905d4c7c7111b11551ca3\"", "is_server_owner": false, - "password": "$6$rounds=702281$U/3ZLVUTudSZLlZH$LrA9kL0T57Lr8GSs6RS4ZAE5vgr8upiAqhnVz.lXvZbn8tMbUz/VpyG9xfSkLvv3BqIzlZIu6mpaczTPlmeRc/", - "self_link": "http://localhost:9001/3.0/users/16", "user_id": 16}'} + "\"53c1c3019e005cfb50dd7397e1483498d4018a74\"", "is_server_owner": false, + "password": "$6$rounds=649705$gGnX160MBIKhAs8w$D0o.zYoLG7I0TbOShTcPoxBYQ67o1vLDwUUYoIBkF/jXkA9XJSZlMhaPQlesUJl2pZQLQghDcAodMYf5rmZQB/", + "self_link": "http://localhost:9001/3.0/users/1298", "user_id": 1298}'} headers: - content-length: ['326'] + content-length: ['330'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/users/16/addresses + method: !!python/unicode GET + uri: http://localhost:9001/3.0/users/1298/addresses response: body: {string: !!python/unicode '{"entries": [{"email": "anotheremail@example.com", - "http_etag": "\"a6242100b2e468ea0c2932b09c86970b7f41152f\"", "original_email": + "http_etag": "\"ef195a05a43fc68a81691e1a5bbc54263846858e\"", "original_email": "anotheremail@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": - "http://localhost:9001/3.0/addresses/anotheremail@example.com", "user": "http://localhost:9001/3.0/users/16", + "http://localhost:9001/3.0/addresses/anotheremail@example.com", "user": "http://localhost:9001/3.0/users/1298", "verified_on": "2005-08-01T07:49:23"}, {"email": "test@example.com", "http_etag": - "\"4f8c6ce236ae784932ac2c3760ac04a842169db0\"", "original_email": "test@example.com", + "\"7fefa11918eff42c60c15e46fbeac723580314f5\"", "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/test@example.com", - "user": "http://localhost:9001/3.0/users/16"}], "http_etag": "\"4885de1b644bfce1c570c6e2e015525db8892d53\"", + "user": "http://localhost:9001/3.0/users/1298"}], "http_etag": "\"c596ae610d0d3119e7c75298372ddb8f2d2818d0\"", "start": 0, "total_size": 2}'} headers: - content-length: ['735'] + content-length: ['739'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/owner response: body: {string: !!python/unicode '{"entries": [{"address": "http://localhost:9001/3.0/addresses/anotheremail@example.com", "delivery_mode": "regular", "email": "anotheremail@example.com", "http_etag": - "\"1a177d5c0b34d37daaf9a81d1509118cf27b4f03\"", "list_id": "foo.example.com", - "member_id": 25, "moderation_action": "accept", "role": "owner", "self_link": - "http://localhost:9001/3.0/members/25", "user": "http://localhost:9001/3.0/users/16"}], - "http_etag": "\"73aa8f440913342ee82941c1b97f3edc0b1efd08\"", "start": 0, "total_size": + "\"2a945828c5f7dff8f8bca3e46dc223b593180cbd\"", "list_id": "foo.example.com", + "member_id": 2002, "moderation_action": "accept", "role": "owner", "self_link": + "http://localhost:9001/3.0/members/2002", "user": "http://localhost:9001/3.0/users/1298"}], + "http_etag": "\"5e4e5832ca1eb6777ab42bb4b98a5912b3c1534c\"", "start": 0, "total_size": 1}'} headers: - content-length: ['500'] + content-length: ['506'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/roster/moderator response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -149,7 +149,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/member/test@example.com response: body: {string: !!python/unicode '{}'} @@ -161,7 +161,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo.example.com/member/anotheremail@example.com response: body: {string: !!python/unicode '{}'} @@ -173,7 +173,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists/foo@example.com/config response: body: {string: !!python/unicode '{"acceptable_aliases": [], "admin_immed_notify": diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_model-2.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_model-2.yaml index d8ec665..b97e37c 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_model-2.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_model-2.yaml @@ -3,10 +3,10 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/test@example.com response: - body: {string: !!python/unicode '404 Not Found'} + body: {string: !!python/unicode 404 Not Found} headers: content-length: ['13'] content-type: [application/json; charset=utf-8] diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_model.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_model.yaml index c200fdd..ca8772d 100644 --- a/src/postorius/tests/fixtures/vcr_cassettes/test_model.yaml +++ b/src/postorius/tests/fixtures/vcr_cassettes/test_model.yaml @@ -3,35 +3,20 @@ body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -46,8 +31,8 @@ body: fqdn_listname=foo%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -59,51 +44,51 @@ body: email=test%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/users response: body: {string: !!python/unicode ''} headers: content-length: ['0'] - location: ['http://localhost:9001/3.0/users/20'] + location: ['http://localhost:9001/3.0/users/1291'] status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users/test@example.com response: body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag": - "\"bd4de82adb461f6b4ea8a7115ed24877bc3a2fcc\"", "is_server_owner": false, - "password": "$6$rounds=658979$XyQacoPmcY8pvmBB$4m.yKSbMA76bwDrA8TeRDjoGMNJ0jATrpH1DuZvSH5jf7xpZCeOivQZMiTHqJpl8VeVVi092ajrqKzwwDZ7kT1", - "self_link": "http://localhost:9001/3.0/users/20", "user_id": 20}'} + "\"804e6b6ec3189523cff49eb1e12395a3fbf37290\"", "is_server_owner": false, + "password": "$6$rounds=720162$.Gg5WmC4f7Jjlamx$hUIqliTwcGedXbg0luyyKE.Aymw1LYsY9DXygAI6VxdCaZxrXUK5gdPDei8Cv1pmt6IRo7HsU42Xt.lZXaOkZ0", + "self_link": "http://localhost:9001/3.0/users/1291", "user_id": 1291}'} headers: - content-length: ['326'] + content-length: ['330'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/users/20/addresses + method: !!python/unicode GET + uri: http://localhost:9001/3.0/users/1291/addresses response: body: {string: !!python/unicode '{"entries": [{"email": "test@example.com", "http_etag": - "\"0d24aeaa8558af4c8640bc902367b2e534efecc1\"", "original_email": "test@example.com", + "\"2b1008db4fceb6c7c9a895c2273285e3947859fa\"", "original_email": "test@example.com", "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/test@example.com", - "user": "http://localhost:9001/3.0/users/20"}], "http_etag": "\"7a60e544b5555116f10f199d66a1d90268ff97f2\"", + "user": "http://localhost:9001/3.0/users/1291"}], "http_etag": "\"82f3460b604e5fac6d29375a58cbaf59867e85cf\"", "start": 0, "total_size": 1}'} headers: - content-length: ['388'] + content-length: ['390'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode '{"entries": [{"display_name": "Foo", "fqdn_listname": @@ -120,7 +105,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode ''} @@ -131,25 +116,114 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users response: body: {string: !!python/unicode '{"entries": [{"created_on": "2005-08-01T07:49:23", - "http_etag": "\"bd4de82adb461f6b4ea8a7115ed24877bc3a2fcc\"", "is_server_owner": - false, "password": "$6$rounds=658979$XyQacoPmcY8pvmBB$4m.yKSbMA76bwDrA8TeRDjoGMNJ0jATrpH1DuZvSH5jf7xpZCeOivQZMiTHqJpl8VeVVi092ajrqKzwwDZ7kT1", - "self_link": "http://localhost:9001/3.0/users/20", "user_id": 20}], "http_etag": - "\"eb5d2f35eab291e2fb095b42534a1c97e541cd45\"", "start": 0, "total_size": - 1}'} + "http_etag": "\"2ecd057a685f08051df47efa2a3e7bd5b3475e6a\"", "is_server_owner": + false, "self_link": "http://localhost:9001/3.0/users/1285", "user_id": 1285}, + {"created_on": "2005-08-01T07:49:23", "http_etag": "\"a3f0c3dc174b9c4fc253d4787d37de5df178d4c2\"", + "is_server_owner": false, "self_link": "http://localhost:9001/3.0/users/1286", + "user_id": 1286}, {"created_on": "2005-08-01T07:49:23", "http_etag": "\"b0fd1b412ec8ca275e0bff7720ac9faf1f8c3c06\"", + "is_server_owner": false, "self_link": "http://localhost:9001/3.0/users/1287", + "user_id": 1287}, {"created_on": "2005-08-01T07:49:23", "http_etag": "\"b4227b126d2a85e1ba67f32c0984fa4bf8d3f0d8\"", + "is_server_owner": false, "self_link": "http://localhost:9001/3.0/users/1288", + "user_id": 1288}, {"created_on": "2005-08-01T07:49:23", "http_etag": "\"0695cfe16d46b9083370652e1bd5e081b06f90a6\"", + "is_server_owner": false, "self_link": "http://localhost:9001/3.0/users/1289", + "user_id": 1289}, {"created_on": "2005-08-01T07:49:23", "http_etag": "\"1bc854b35b090c5f74b51f8d83f071df284919d4\"", + "is_server_owner": false, "self_link": "http://localhost:9001/3.0/users/1290", + "user_id": 1290}, {"created_on": "2005-08-01T07:49:23", "http_etag": "\"804e6b6ec3189523cff49eb1e12395a3fbf37290\"", + "is_server_owner": false, "password": "$6$rounds=720162$.Gg5WmC4f7Jjlamx$hUIqliTwcGedXbg0luyyKE.Aymw1LYsY9DXygAI6VxdCaZxrXUK5gdPDei8Cv1pmt6IRo7HsU42Xt.lZXaOkZ0", + "self_link": "http://localhost:9001/3.0/users/1291", "user_id": 1291}], "http_etag": + "\"016838a383653046fe9c860c4189280659482f6d\"", "start": 0, "total_size": + 7}'} headers: - content-length: ['431'] + content-length: ['1611'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' - uri: http://localhost:9001/3.0/users/20 + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/users/1285 + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/users/1286 + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/users/1287 + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/users/1288 + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/users/1289 + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/users/1290 + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/users/1291 + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode ''} headers: @@ -159,35 +233,20 @@ body: mail_host=example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/domains response: - body: {string: !!python/unicode 'Duplicate email host: example.com'} + body: {string: !!python/unicode ''} headers: - content-length: ['33'] - content-type: [application/json; charset=utf-8] - status: {code: 400, message: Bad Request} + content-length: ['0'] + location: ['http://localhost:9001/3.0/domains/example.com'] + status: {code: 201, message: Created} - request: body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' - uri: http://localhost:9001/3.0/domains/example.com - response: - body: {string: !!python/unicode '{"base_url": "http://example.com", "description": - null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host": - "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com", - "url_host": "example.com"}'} - headers: - content-length: ['233'] - content-type: [application/json; charset=utf-8] - status: {code: 200, message: OK} -- request: - body: null - headers: - accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/domains/example.com response: body: {string: !!python/unicode '{"base_url": "http://example.com", "description": @@ -202,8 +261,8 @@ body: fqdn_listname=foo%40example.com headers: accept-encoding: ['gzip, deflate'] - !!python/unicode 'content-type': [!!python/unicode 'application/x-www-form-urlencoded'] - method: !!python/unicode 'POST' + !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded] + method: !!python/unicode POST uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode ''} @@ -215,7 +274,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/lists response: body: {string: !!python/unicode '{"entries": [{"display_name": "Foo", "fqdn_listname": @@ -232,7 +291,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'DELETE' + method: !!python/unicode DELETE uri: http://localhost:9001/3.0/lists/foo@example.com response: body: {string: !!python/unicode ''} @@ -243,7 +302,7 @@ body: null headers: accept-encoding: ['gzip, deflate'] - method: !!python/unicode 'GET' + method: !!python/unicode GET uri: http://localhost:9001/3.0/users response: body: {string: !!python/unicode '{"http_etag": "\"32223434a0f3af4cdc4673d1fbc5bac1f6d98fd3\"", @@ -252,4 +311,15 @@ content-length: ['90'] content-type: [application/json; charset=utf-8] status: {code: 200, message: OK} +- request: + body: null + headers: + accept-encoding: ['gzip, deflate'] + method: !!python/unicode DELETE + uri: http://localhost:9001/3.0/domains/example.com + response: + body: {string: !!python/unicode ''} + headers: + content-length: ['0'] + status: {code: 204, message: No Content} version: 1 diff --git a/src/postorius/tests/mailman_api_tests/test_archival_options.py b/src/postorius/tests/mailman_api_tests/test_archival_options.py index 386219d..f368d82 100644 --- a/src/postorius/tests/mailman_api_tests/test_archival_options.py +++ b/src/postorius/tests/mailman_api_tests/test_archival_options.py @@ -50,10 +50,7 @@ @MM_VCR.use_cassette('archival_options.yaml') def setUp(self): # Create domain `example.com` in Mailman - try: - example_com = get_client().create_domain('example.com') - except HTTPError: - example_com = get_client().get_domain('example.com') + example_com = get_client().create_domain('example.com') self.m_list = example_com.create_list('test_list') self.test_user = User.objects.create_user( 'test_user', 'test_user@example.com', 'pwd') @@ -65,6 +62,7 @@ self.test_user.delete() self.test_superuser.delete() self.m_list.delete() + get_client().delete_domain('example.com') @MM_VCR.use_cassette('archival_options.yaml') def test_no_access_for_unauthenticated_user(self): @@ -86,10 +84,7 @@ @MM_VCR.use_cassette('test_list_archival_options.yaml') def setUp(self): # Create domain `example.com` in Mailman. - try: - example_com = get_client().create_domain('example.com') - except HTTPError: - example_com = get_client().get_domain('example.com') + example_com = get_client().create_domain('example.com') self.m_list = example_com.create_list('test_list') self.test_user = User.objects.create_user( 'test_user', 'test_user@example.com', 'pwd') @@ -103,6 +98,7 @@ self.test_user.delete() self.test_superuser.delete() self.m_list.delete() + get_client().delete_domain('example.com') @MM_VCR.use_cassette('test_list_archival_options.yaml') def test_context_contains_list_archivers(self): diff --git a/src/postorius/tests/mailman_api_tests/test_domain_index.py b/src/postorius/tests/mailman_api_tests/test_domain_index.py new file mode 100644 index 0000000..bf545a7 --- /dev/null +++ b/src/postorius/tests/mailman_api_tests/test_domain_index.py @@ -0,0 +1,102 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2012-2015 by the Free Software Foundation, Inc. +# +# This file is part of Postorius. +# +# Postorius is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# Postorius is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along with +# Postorius. If not, see . + +import logging + +from django.core.urlresolvers import reverse +from django.test import Client, SimpleTestCase +from django.contrib.auth.models import User +try: + from urllib2 import HTTPError +except ImportError: + from urllib.error import HTTPError + +from postorius.utils import get_client +from postorius.tests import MM_VCR + + +logger = logging.getLogger(__name__) +vcr_log = logging.getLogger('vcr') +vcr_log.setLevel(logging.WARNING) + + +class DomainIndexPageTest(SimpleTestCase): + """Tests for the list index page.""" + + @MM_VCR.use_cassette('test_domain_index.yaml') + def setUp(self): + self.domain = get_client().create_domain('example.com') + try: + self.foo_list = self.domain.create_list('foo') + except HTTPError: + self.foo_list = get_client().get_list('foo.example.com') + + self.user = User.objects.create_user( + 'testuser', 'test@example.com', 'testpass') + self.superuser = User.objects.create_superuser( + 'testsu', 'su@example.com', 'testpass') + self.owner = User.objects.create_user( + 'testowner', 'owner@example.com', 'testpass') + self.moderator = User.objects.create_user( + 'testmoderator', 'moderator@example.com', 'testpass') + self.foo_list.add_owner('owner@example.com') + self.foo_list.add_moderator('moderator@example.com') + + @MM_VCR.use_cassette('test_domain_index.yaml') + def tearDown(self): + self.foo_list.delete() + self.user.delete() + self.superuser.delete() + self.owner.delete() + self.moderator.delete() + get_client().delete_domain('example.com') + + @MM_VCR.use_cassette('test_domain_index.yaml') + def test_domain_index_not_accessible_to_public(self): + # The list index page should contain the lists + response = self.client.get(reverse('domain_index')) + self.assertEqual(response.status_code, 302) + + @MM_VCR.use_cassette('test_domain_index.yaml') + def test_domain_index_not_accessible_to_unpriveleged_user(self): + # The list index page should contain the lists + self.client.login(username='testuser', password='testpass') + response = self.client.get(reverse('domain_index')) + self.assertEqual(response.status_code, 302) + + @MM_VCR.use_cassette('test_domain_index.yaml') + def test_domain_index_not_accessible_to_moderators(self): + # The list index page should contain the lists + self.client.login(username='testmoderator', password='testpass') + response = self.client.get(reverse('domain_index')) + self.assertEqual(response.status_code, 302) + + @MM_VCR.use_cassette('test_domain_index.yaml') + def test_domain_index_not_accessible_to_owners(self): + # The list index page should contain the lists + self.client.login(username='testowner', password='testpass') + response = self.client.get(reverse('domain_index')) + self.assertEqual(response.status_code, 302) + + @MM_VCR.use_cassette('test_domain_index.yaml') + def test_domain_index_contains_the_domains(self): + # The list index page should contain the lists + self.client.login(username='testsu', password='testpass') + response = self.client.get(reverse('domain_index')) + self.assertEqual(response.status_code, 200) + self.assertEqual(len(response.context['domains']), 1) + self.assertContains(response, 'example.com') diff --git a/src/postorius/tests/mailman_api_tests/test_domain_new.py b/src/postorius/tests/mailman_api_tests/test_domain_new.py new file mode 100644 index 0000000..ebf541a --- /dev/null +++ b/src/postorius/tests/mailman_api_tests/test_domain_new.py @@ -0,0 +1,80 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2012-2015 by the Free Software Foundation, Inc. +# +# This file is part of Postorius. +# +# Postorius is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# Postorius is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along with +# Postorius. If not, see . +import time +import logging + +from django.conf import settings +from django.contrib.auth.models import User +from django.core.urlresolvers import reverse +from django.shortcuts import resolve_url +from django.test import Client, SimpleTestCase + +try: + from urllib2 import HTTPError +except ImportError: + from urllib.error import HTTPError + +from postorius.utils import get_client +from postorius.tests import MM_VCR + + +logger = logging.getLogger(__name__) +vcr_log = logging.getLogger('vcr') +vcr_log.setLevel(logging.WARNING) + + +class DomainCreationTest(SimpleTestCase): + """Tests for the new list page.""" + + @MM_VCR.use_cassette('test_domain_creation.yaml') + def setUp(self): + self.user = User.objects.create_user('user', 'user@example.com', 'pwd') + self.superuser = User.objects.create_superuser('su', 'su@example.com', + 'pwd') + + @MM_VCR.use_cassette('test_list_creation.yaml') + def tearDown(self): + self.user.delete() + self.superuser.delete() + try: + get_client().delete_domain('example.com') + except HTTPError: + pass + + def test_permission_denied(self): + self.client.login(username='user', password='pwd') + response = self.client.get(reverse('domain_new')) + expected = 'http://testserver%s?next=%s' % ( + resolve_url(settings.LOGIN_URL), reverse('domain_new')) + self.assertEqual(response['location'], expected) + + @MM_VCR.use_cassette('test_list_creation.yaml') + def test_new_domain_created_with_owner(self): + self.client.login(username='su', password='pwd') + post_data = {'mail_host': 'example.com', + 'web_host': 'http://example.com', + 'description': 'A new Domain.'} + response = self.client.post(reverse('domain_new'), post_data, follow=True) + + self.assertContains(response, 'New Domain registered') + self.assertRedirects(response, reverse('domain_index')) + + a_new_domain = get_client().get_domain('example.com') + self.assertEqual(a_new_domain.mail_host, u'example.com') + self.assertEqual(a_new_domain.base_url, u'http://example.com') + self.assertEqual(a_new_domain.owners[0]['user_id'], + get_client().get_user('su@example.com').user_id) diff --git a/src/postorius/tests/mailman_api_tests/test_list_index.py b/src/postorius/tests/mailman_api_tests/test_list_index.py index 41f1eea..ba1551c 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_index.py +++ b/src/postorius/tests/mailman_api_tests/test_list_index.py @@ -38,10 +38,7 @@ @MM_VCR.use_cassette('test_list_index.yaml') def setUp(self): - try: - self.domain = get_client().create_domain('example.com') - except HTTPError: - self.domain = get_client().get_domain('example.com') + self.domain = get_client().create_domain('example.com') self.foo_list = self.domain.create_list('foo') self.bar_list = self.domain.create_list('bar') @@ -49,6 +46,7 @@ def tearDown(self): for mlist in get_client().lists: mlist.delete() + get_client().delete_domain('example.com') @MM_VCR.use_cassette('test_list_index.yaml') def test_list_index_contains_the_lists(self): diff --git a/src/postorius/tests/mailman_api_tests/test_list_members.py b/src/postorius/tests/mailman_api_tests/test_list_members.py index 3a8fc0a..46f706b 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_members.py +++ b/src/postorius/tests/mailman_api_tests/test_list_members.py @@ -44,14 +44,8 @@ @MM_VCR.use_cassette('list_members_access.yaml') def setUp(self): - try: - self.domain = get_client().create_domain('example.com') - except HTTPError: - self.domain = get_client().get_domain('example.com') - try: - self.foo_list = self.domain.create_list('foo') - except HTTPError: - self.foo_list = get_client().get_list('foo.example.com') + self.domain = get_client().create_domain('example.com') + self.foo_list = self.domain.create_list('foo') self.user = User.objects.create_user( 'testuser', 'test@example.com', 'testpass') self.superuser = User.objects.create_superuser( @@ -70,6 +64,7 @@ self.superuser.delete() self.owner.delete() self.moderator.delete() + get_client().delete_domain('example.com') @MM_VCR.use_cassette('list_members_access.yaml') def test_page_not_accessible_if_not_logged_in(self): @@ -120,10 +115,7 @@ @MM_VCR.use_cassette('test_list_members_owner.yaml') def setUp(self): self.mm_client = get_client() - try: - self.domain = self.mm_client.create_domain('example.com') - except HTTPError: - self.domain = self.mm_client.get_domain('example.com') + self.domain = self.mm_client.create_domain('example.com') self.foo_list = self.domain.create_list('foo') self.su = User.objects.create_superuser( 'su', 'su@example.com', 'pwd') @@ -134,6 +126,7 @@ def tearDown(self): self.foo_list.delete() self.su.delete() + get_client().delete_domain('example.com') @MM_VCR.use_cassette('test_list_members_owner_add_remove.yaml') def test_add_remove_owner(self): @@ -207,10 +200,7 @@ @MM_VCR.use_cassette('test_list_members_add_moderator.yaml') def setUp(self): - try: - self.domain = get_client().create_domain('example.com') - except HTTPError: - self.domain = get_client().get_domain('example.com') + self.domain = get_client().create_domain('example.com') self.foo_list = self.domain.create_list('foo') self.su = User.objects.create_superuser( 'su', 'su@example.com', 'pwd') @@ -226,6 +216,7 @@ def tearDown(self): self.foo_list.delete() self.su.delete() + get_client().delete_domain('example.com') @MM_VCR.use_cassette('test_list_members_new_moderator_added.yaml') def test_new_moderator_added(self): diff --git a/src/postorius/tests/mailman_api_tests/test_list_new.py b/src/postorius/tests/mailman_api_tests/test_list_new.py index 63a9bda..e835775 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_new.py +++ b/src/postorius/tests/mailman_api_tests/test_list_new.py @@ -45,10 +45,7 @@ self.user = User.objects.create_user('user', 'user@example.com', 'pwd') self.superuser = User.objects.create_superuser('su', 'su@example.com', 'pwd') - try: - self.domain = get_client().create_domain('example.com') - except HTTPError: - self.domain = get_client().get_domain('example.com') + self.domain = get_client().create_domain('example.com') @MM_VCR.use_cassette('test_list_creation.yaml') def tearDown(self): @@ -56,6 +53,7 @@ self.superuser.delete() for mlist in get_client().lists: mlist.delete() + get_client().delete_domain('example.com') def test_permission_denied(self): self.client.login(username='user', password='pwd') diff --git a/src/postorius/tests/mailman_api_tests/test_list_summary.py b/src/postorius/tests/mailman_api_tests/test_list_summary.py index 52aff81..0472659 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_summary.py +++ b/src/postorius/tests/mailman_api_tests/test_list_summary.py @@ -44,10 +44,7 @@ @MM_VCR.use_cassette('test_list_summary.yaml') def setUp(self): self.mmclient = get_client() - try: - domain = self.mmclient.create_domain('example.com') - except HTTPError: - domain = self.mmclient.get_domain('example.com') + domain = self.mmclient.create_domain('example.com') self.foo_list = domain.create_list('foo') try: User.objects.create_user('testuser', 'test@example.com', 'testpass') @@ -61,6 +58,7 @@ for user in self.mmclient.users: user.delete() User.objects.all().delete() + get_client().delete_domain('example.com') @MM_VCR.use_cassette('test_list_summary.yaml') def test_list_summary_logged_out(self): diff --git a/src/postorius/tests/mailman_api_tests/test_models.py b/src/postorius/tests/mailman_api_tests/test_models.py index 163e757..33947f6 100644 --- a/src/postorius/tests/mailman_api_tests/test_models.py +++ b/src/postorius/tests/mailman_api_tests/test_models.py @@ -40,10 +40,7 @@ @MM_VCR.use_cassette('test_model.yaml') def setUp(self): self.mmclient = get_client() - try: - self.domain = get_client().create_domain('example.com') - except HTTPError: - self.domain = get_client().get_domain('example.com') + self.domain = get_client().create_domain('example.com') self.foo_list = self.domain.create_list('foo') @MM_VCR.use_cassette('test_model.yaml') @@ -53,6 +50,7 @@ for user in self.mmclient.users: user.delete() User.objects.all().delete() + get_client().delete_domain('example.com') @MM_VCR.use_cassette('test_model-2.yaml') def test_mailman_user_not_created_when_flag_is_off(self): diff --git a/src/postorius/tests/mailman_api_tests/test_subscriptions.py b/src/postorius/tests/mailman_api_tests/test_subscriptions.py index 5565ed4..d0f25cf 100644 --- a/src/postorius/tests/mailman_api_tests/test_subscriptions.py +++ b/src/postorius/tests/mailman_api_tests/test_subscriptions.py @@ -40,11 +40,7 @@ @MM_VCR.use_cassette('test_list_subscription.yaml') def setUp(self): - mm_client = get_client() - try: - self.domain = mm_client.create_domain('example.com') - except HTTPError: - self.domain = mm_client.get_domain('example.com') + self.domain = get_client().create_domain('example.com') self.open_list = self.domain.create_list('open_list') # Set subscription policy to open settings = self.open_list.settings @@ -72,6 +68,7 @@ self.open_list.delete() self.mod_list.delete() self.mm_user.delete() + get_client().delete_domain('example.com') @MM_VCR.use_cassette('test_list_subscription_open_primary.yaml') def test_subscribe_open(self):