Add tests

Author: leviable

.travis.yml

@@ -4,11 +4,8 @@ os:
 - linux
 python:
 - '2.7'
-- '3.3'
-- '3.4'
 - '3.5'
 - '3.6'
-- pypy
 install:
 - pip install -U pip
 - pip install -U setuptools

recho/__init__.py

@@ -1,3 +1,6 @@
-from pbr.version import VersionInfo
+from pkg_resources import get_distribution, DistributionNotFound
 
-__version__ = VersionInfo('recho').semantic_version().release_string()
+try:
+    __version__ = get_distribution(__name__).version
+except DistributionNotFound:  # pragma: no cover
+    __version__ = '0.0.0'

recho/cli.py

@@ -101,7 +101,7 @@ def main():
         timestamps[args.redditor] = latest_timestamp.timestamp()
         with open(args.timestamp_file, 'w') as w:  # pylint: disable=C0103
             w.write(json.dumps(timestamps, indent=4, sort_keys=True))
-    except:
+    except Exception:
         # Log to sentry, if configured
         if 'sentry' in config:
             key, secret = config['sentry']['key'], config['sentry']['secret']

recho/recho.py

@@ -2,14 +2,12 @@
 from datetime import datetime as dt
 
 import praw
-from retry import retry
 from slacker import Slacker
-from requests.exceptions import ConnectionError  # pylint: disable=redefined-builtin
 from praw.models.reddit.comment import Comment
 from praw.models.reddit.submission import Submission
 
-from recho import __version__ as recho_version
-from recho.reddit import RedditComment, RedditSubmission
+from . import __version__ as recho_version
+from .reddit import RedditComment, RedditSubmission
 
 TIME_PERIOD = 'week'
 
@@ -18,16 +16,6 @@ class RechoError(Exception):
     pass
 
 
-@retry(ConnectionError, tries=3, delay=1, backoff=2)
-def _get_comments(redditor):
-    return redditor.get_comments(time=TIME_PERIOD)
-
-
-@retry(ConnectionError, tries=3, delay=1, backoff=2)
-def _get_submitted(redditor):
-    return redditor.get_submitted(time=TIME_PERIOD)
-
-
 def build_user_agent():
     recho_version_trunk = recho_version.split("+")[0]
     user_agent = '{0}:recho:{1} (by /u/IHKAS1984)'

requirements.txt

@@ -1,34 +1,3 @@
-[metadata]
-name = recho
-author = Levi Noecker
-author-email = [email protected]
-summary = Post the Reddit users's latest comment(s) to a specific Slack channel
-description-file = README.rst
-home-page = https://github.com/DankCity/recho
-license = MIT
-keywords = reddit slack bot slackbot recho chat chatbot
-classifier =
-    Development Status :: 4 - Beta
-    Intended Audience :: Developers
-    Natural Language :: English
-    License :: OSI Approved :: MIT License
-    Operating System :: OS Independent
-    Topic :: Communications :: Chat
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
-    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: Implementation :: CPython
-
-[files]
-packages =
-    recho
-
-[entry_points]
-console_scripts =
-    recho = recho.cli:main
-
 [tool:pytest]
 testpaths = tests
 

setup.cfg

@@ -1,9 +1,49 @@
 """
 Use setup tools to setup recho as a standard python package
 """
-from setuptools import setup
+import os
+from setuptools import find_packages, setup
+
+# Get the long description from the README file
+HERE = os.path.dirname(os.path.abspath(__file__))
+with open(os.path.join(HERE, 'README.rst')) as f:
+    LONG_DESCRIPTION = f.read()
+
 
 setup(
-    setup_requires=['pbr>=1.9', 'setuptools>=17.1'],
-    pbr=True,
+    name="recho",
+    author='Levi Noecker',
+    author_email='[email protected]',
+    url='https://github.com/levi-rs/recho',
+    description=LONG_DESCRIPTION,
+    licence='MIT',
+    packages=find_packages(),
+    use_scm_version={'root': '.', 'relative_to': __file__},
+    setup_requires=['setuptools_scm'],
+    install_requires=[
+        'configparser==3.5.0',
+        'praw>=5.3.0',
+        'raven',
+        'slacker==0.9.30',
+    ],
+    keywords='reddit slack bot slackbot recho chat chatbot',
+    classifiers=[
+        'Development Status :: 4 - Beta',
+        'Intended Audience :: Developers',
+        'Natural Language :: English',
+        'License :: OSI Approved :: MIT License',
+        'Operating System :: OS Independent',
+        'Topic :: Communications :: Chat',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: Implementation :: CPython',
+    ],
+    entry_points={
+        'console_scripts': [
+            'recho=recho.cli:main',
+        ]
+    },
 )

setup.py

@@ -0,0 +1,112 @@
+from datetime import datetime as dt, timedelta
+from mock import patch, create_autospec, MagicMock
+import time
+
+from praw.models.reddit.comment import Comment
+from praw.models.reddit.submission import Submission
+import pytest
+
+from recho import recho
+
+CREDS = {'client_id': 'mock id', 'client_secret': 'mock secret'}
+SLACK = {'token': 'mock token', 'channel': 'mock channel'}
+TS = dt.utcnow() - timedelta(days=1)
+AUTHOR = 'mock author'
+TITLE = 'Mock Title ' + '0123456789' * 7
+LINK = "http://mock.link"
+TEXT = "mock body text"
+
+
+def make_ts(ts):
+    return int((time.mktime(ts.timetuple())+ts.microsecond/1e6))
+
+
+@pytest.fixture()
+def com():
+    comm = create_autospec(Comment)
+    comm.created_utc = make_ts(TS + timedelta(days=1))
+    comm.author = AUTHOR
+    comm.title = TITLE
+    comm.permalink = LINK
+    comm.text = TEXT
+    yield comm
+
+
+@pytest.fixture()
+def old_com():
+    comm = create_autospec(Comment)
+    comm.created_utc = make_ts(TS - timedelta(days=1))
+    comm.author = AUTHOR
+    comm.title = TITLE
+    comm.permalink = LINK
+    comm.text = TEXT
+    yield comm
+
+
+@pytest.fixture()
+def sub():
+    subm = create_autospec(Submission)
+    subm.created_utc = make_ts(TS + timedelta(days=1))
+    subm.author = AUTHOR
+    subm.title = TITLE
+    subm.permalink = LINK
+    subm.text = TEXT
+    yield subm
+
+
+@pytest.fixture()
+def old_sub():
+    subm = create_autospec(Submission)
+    subm.created_utc = make_ts(TS - timedelta(days=1))
+    subm.author = AUTHOR
+    subm.title = TITLE
+    subm.permalink = LINK
+    subm.text = TEXT
+    yield subm
+
+
+@pytest.fixture()
+def new(com, old_com, sub, old_sub):
+    new = sorted([com, old_com, sub, old_sub], key=lambda x: x.created_utc)
+    return reversed(new)
+
+
+def test_build_user_agent():
+    """ Validate user agent is built """
+    assert "recho:" in recho.build_user_agent()
+
+
+@patch('recho.recho.praw')
+def test_get_posts_since(praw_mock, new):
+    """ Validate can filter down to recent posts """
+    praw_mock.Reddit.return_value = praw_mock
+    praw_mock.redditor.return_value = praw_mock
+    praw_mock.new.return_value = new
+    posts = recho.get_posts_since(CREDS, 'mock name', TS)
+
+    assert len(posts) == 2
+
+
+@patch('recho.recho.praw')
+def test_get_posts_since_exc(praw_mock, new):
+    """ Validate an exception is raised if unkown type is found """
+    praw_mock.Reddit.return_value = praw_mock
+    praw_mock.redditor.return_value = praw_mock
+    unknown = MagicMock()
+    unknown.created_utc = make_ts(TS + timedelta(days=1))
+    praw_mock.new.return_value = [unknown, ]
+
+    with pytest.raises(recho.RechoError) as exc:
+        recho.get_posts_since(CREDS, 'mock name', TS)
+
+    assert "Unknown comment/submission" in str(exc.value)
+
+
+@patch('recho.recho.Slacker')
+def test_post_to_slack(slack_mock, new):
+    """ """
+    slack_mock.return_value = slack_mock
+
+    recho.post_to_slack(SLACK, new)
+
+    assert slack_mock.chat.post_message.call_count == 4

tests/__init__.py

@@ -1,17 +1,18 @@
 [tox]
-skipdist = True
 envlist = py{27,35,36},lint
 
 [testenv]
 commands =
-    py.test -s --cov recho --cov-report term-missing --cov-report html --cov-report xml --junitxml={envdir}/junit.xml tests []
+    py.test -s --cov recho --cov-report term-missing tests []
 deps =
+    mock
     pytest>=3.0
     pytest-cov>=1.8.1
 
 [testenv:lint]
+skipsdist = True
 deps =
-    flake8==2.4.0
+    flake8
 commands =
     flake8 setup.py recho tests