gryf/tuir
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge conflicts

Browse Source
This commit is contained in:
woorst
2016-07-18 16:18:33 -05:00
parent 022dd7e449 bf59214de0
commit c8ff233c7c
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/conftest.py
View File

@@ -223,6 +223,7 @@ def subreddit_page(reddit, terminal, config, oauth):
def list_reddits_page(reddit, terminal, config, oauth): def list_reddits_page(reddit, terminal, config, oauth):
title = 'Popular Subreddits' title = 'Popular Subreddits'
func = reddit.get_popular_subreddits func = reddit.get_popular_subreddits
with terminal.loader(): with terminal.loader():
page = ListRedditsPage(reddit, title, func, terminal, config, oauth) page = ListRedditsPage(reddit, title, func, terminal, config, oauth)
assert terminal.loader.exception is None assert terminal.loader.exception is None