Ticket/18629 #3
Merged
Ticket/18629 #3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There are still a couple failures, but they seem less trivial than the ones fixed in this commit.
|
Adding requests to install_requires now has the tests running on Travis, and failing in the same way as the develop branch. http://travis-ci.org/#!/pculture/vidscraper/jobs/955794 I'll find the fix there, then merge it in. |
Conflicts: setup.py
| # def test_CantIdentifyUrl_for_video(self): | ||
| # self.assertRaises(CantIdentifyUrl, self.suite.get_video, | ||
| # 'http://www.google.com/') | ||
|
|
||
| def test_basic_feed_data(self): | ||
| feed = self.suite.get_feed( | ||
| 'file://%s' % os.path.join(self.data_file_dir, 'feed.rss')) | ||
| 'file://%s' % self._data_file_path('feed/feed.rss')) |
There was a problem hiding this comment.
Maybe we need a data_file_url method?
There was a problem hiding this comment.
Maybe, but I don't think that should be part of this pull. Maybe when we refactor the feeds?
Conflicts: setup.py vidscraper/suites/fora.py vidscraper/suites/google.py vidscraper/suites/youtube.py
|
AFAIK this branch is ready. Is that correct? |
|
Yes, that's correct. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This refactors the single-video parts of vidscraper to use class-based scraping methods as per bug 18629. The tests all pass locally, but travis seems to be having trouble installing vidscraper for some reason: http://travis-ci.org/#!/pculture/vidscraper/jobs/955735