Remove origin from FeedMeta
It is barely used but complicates things mightily.
This commit is contained in:
parent
cce0ad9f8f
commit
a105cdc649
4 changed files with 24 additions and 31 deletions
|
|
@ -4,7 +4,6 @@ import http.server
|
|||
import threading
|
||||
import typing
|
||||
|
||||
import requests
|
||||
|
||||
from cry import feed
|
||||
|
||||
|
|
@ -118,7 +117,7 @@ def test_basic_successful_fetch():
|
|||
with TestWebServer() as server:
|
||||
server.handle("/", TEST_FEED, content_type="text/xml")
|
||||
|
||||
meta = feed.FeedMeta.from_url(server.make_url("/"), "asdf")
|
||||
meta = feed.FeedMeta.from_url(server.make_url("/"))
|
||||
result, new_meta = asyncio.run(feed.fetch_feed(meta))
|
||||
|
||||
assert new_meta.url == meta.url
|
||||
|
|
@ -132,7 +131,7 @@ def test_fetch_after_temp_redirect():
|
|||
server.handle("/old", code=307, headers=[("location", "/temp")])
|
||||
server.handle("/temp", TEST_FEED, content_type="text/xml")
|
||||
|
||||
meta = feed.FeedMeta.from_url(server.make_url("/old"), "asdf")
|
||||
meta = feed.FeedMeta.from_url(server.make_url("/old"))
|
||||
result, new_meta = asyncio.run(feed.fetch_feed(meta))
|
||||
assert new_meta.url == meta.url
|
||||
assert isinstance(result, feed.Feed)
|
||||
|
|
@ -143,7 +142,7 @@ def test_fetch_after_permanent_redirect():
|
|||
server.handle("/old", code=308, headers=[("location", "/perm")])
|
||||
server.handle("/perm", TEST_FEED, content_type="text/xml")
|
||||
|
||||
meta = feed.FeedMeta.from_url(server.make_url("/old"), "asdf")
|
||||
meta = feed.FeedMeta.from_url(server.make_url("/old"))
|
||||
result, new_meta = asyncio.run(feed.fetch_feed(meta))
|
||||
assert new_meta.url == server.make_url("/perm")
|
||||
assert isinstance(result, feed.Feed)
|
||||
|
|
@ -155,7 +154,7 @@ def test_fetch_after_permanent_to_temporary_redirect():
|
|||
server.handle("/perm", code=307, headers=[("location", "/temp")])
|
||||
server.handle("/temp", TEST_FEED, content_type="text/xml")
|
||||
|
||||
meta = feed.FeedMeta.from_url(server.make_url("/old"), "asdf")
|
||||
meta = feed.FeedMeta.from_url(server.make_url("/old"))
|
||||
result, new_meta = asyncio.run(feed.fetch_feed(meta))
|
||||
|
||||
# NOTE: we should record the PERMANENT redirect, not the temporary one.
|
||||
|
|
@ -169,7 +168,7 @@ def test_fetch_after_permanent_to_permanent_redirect():
|
|||
server.handle("/one", code=308, headers=[("location", "/two")])
|
||||
server.handle("/two", TEST_FEED, content_type="text/xml")
|
||||
|
||||
meta = feed.FeedMeta.from_url(server.make_url("/old"), "asdf")
|
||||
meta = feed.FeedMeta.from_url(server.make_url("/old"))
|
||||
result, new_meta = asyncio.run(feed.fetch_feed(meta))
|
||||
|
||||
# NOTE: we should record the latest redirect.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue