Verified Commit 6f2e72f4 authored by Antoine Beaupré's avatar Antoine Beaupré
Browse files

cosmetic: consistent test comparison 

We should do "expected == actual" because that is the way the diff is
ordered on display. That's a rather opiniated way of doing things, but
at least we should be consistent across the board, which we weren't
before.
parent 9fbbe521

feed2exec/tests/test_feeds.py

+11 −10
Original line number Diff line number Diff line
@@ -71,16 +71,16 @@ def test_add(test_db, conf_path): # noqa 
    with pytest.raises(AttributeError):

        st.add(**test_data)

    for r in st:

        assert r['name'] == test_data['name'], 'iterator works'

        assert test_data['name'] == r['name'], 'iterator works'

    st.remove(test_data['name'])

    assert test_data['name'] not in st, 'remove works'





def test_settings(test_db, conf_path, betamax):  # noqa

    st = FeedManager()

    assert len(list(st)) == 0

    assert 0 == len(list(st))

    st.add(**test_params)

    assert len(list(st)) == 1

    assert 1 == len(list(st))

    st.set(test_params['name'], 'catchup', 'True')

    st.remove_option(test_params['name'], 'filter')

    st.fetch()
@@ -105,9 +105,9 @@ def test_pattern(test_db, conf_path): # noqa 
    st.add(**test_data2)

    assert test_data2['name'] in st, 'second add works'

    feeds = list(FeedManager(pattern='test2'))

    assert len(feeds) == 1, 'find only one item'

    assert 1 == len(feeds), 'find only one item'

    feeds = list(FeedManager(pattern='test'))

    assert len(feeds) == 2, 'find two items'

    assert 2 == len(feeds), 'find two items'





def test_cache(test_db):  # noqa
@@ -120,7 +120,7 @@ def test_cache(test_db): # noqa 
    st.add('another')

    for item in tmp:

        assert item

        if item['guid'] == 'another':

        if 'another' == item['guid']:

            break

    else:  # sanity check

        assert False, 'failed to iterate through storage'  # pragma: nocover
@@ -143,12 +143,12 @@ def test_fetch(test_db, conf_path, betamax): # noqa 
    feed2exec.plugins.echo.output.called = False

    assert not feed2exec.plugins.echo.output.called

    st.fetch()

    assert feed2exec.plugins.echo.output.called == ('test_nasa', )

    assert ('test_nasa', ) == feed2exec.plugins.echo.output.called

    feed2exec.plugins.echo.output.called = False

    assert not feed2exec.plugins.echo.output.called

    st.add(**test_udd)

    st.fetch()

    assert feed2exec.plugins.echo.output.called == ('test_udd', )

    assert ('test_udd', ) == feed2exec.plugins.echo.output.called





def test_fetch_parallel(test_db, conf_path, capfd, betamax):  # noqa
@@ -185,14 +185,15 @@ def test_config(conf_path): # noqa 
    conf = ConfFeedStorage()

    conf.add(**test_sample)

    assert conf_path.check()

    assert conf_path.read() == '''[sample]

    expected = '''[sample]

url = %s

output = feed2exec.plugins.echo

args = 1 2 3 4



''' % test_sample['url']

    assert expected == conf_path.read()

    assert 'sample' in conf

    for feed in conf:

        assert type(feed) is feed2exec.feeds.Feed

    conf.remove('sample')

    assert conf_path.read() == ''
 
    assert '' == conf_path.read()

feed2exec/tests/test_main.py

+14 −15
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ from feed2exec.tests.fixtures import static_boundary # noqa 
def test_usage():

    runner = CliRunner()

    result = runner.invoke(main, ['--help'])

    assert result.exit_code == 0

    assert 0 == result.exit_code





def test_basics(tmpdir_factory, static_boundary):  # noqa
@@ -35,31 +35,30 @@ def test_basics(tmpdir_factory, static_boundary): # noqa 
                                  test_sample['name'],

                                  test_sample['url']])

    assert conf_dir.join('feed2exec.ini').check()

    assert result.exit_code == 0

    assert 0 == result.exit_code

    result = runner.invoke(main, ['--config', str(conf_path),

                                  '--database', str(db_path),

                                  'add',

                                  test_sample['name'],

                                  test_sample['url']])

    assert result.exit_code == 2

    assert 2 == result.exit_code

    assert 'already exists' in result.output

    result = runner.invoke(main, ['--config', str(conf_path),

                                  '--database', str(db_path),

                                  'ls'])

    assert result.exit_code == 0

    assert 0 == result.exit_code

    del test_sample['args']

    assert result.output.strip() == json.dumps(test_sample,

                                               indent=2,

                                               sort_keys=True)

    expected = json.dumps(test_sample, indent=2, sort_keys=True)

    assert expected == result.output.strip()

    result = runner.invoke(main, ['--config', str(conf_path),

                                  '--database', str(db_path),

                                  'rm', test_sample['name']])

    assert result.exit_code == 0

    assert 0 == result.exit_code

    result = runner.invoke(main, ['--config', str(conf_path),

                                  '--database', str(db_path),

                                  'ls'])

    assert result.exit_code == 0

    assert result.output == ""

    assert 0 == result.exit_code

    assert "" == result.output



    maildir = conf_dir.join('maildir')

    result = runner.invoke(main, ['--config', str(conf_path),
@@ -69,7 +68,7 @@ def test_basics(tmpdir_factory, static_boundary): # noqa 
                                  test_nasa['name'],

                                  test_nasa['url']])

    assert conf_dir.join('feed2exec.ini').check()

    assert result.exit_code == 0

    assert 0 == result.exit_code



    test_path = utils.find_test_file('planet-debian.xml')

    result = runner.invoke(main, ['--config', str(conf_path),
@@ -81,7 +80,7 @@ def test_basics(tmpdir_factory, static_boundary): # noqa 
    result = runner.invoke(main, ['--config', str(conf_path),

                                  '--database', str(db_path),

                                  'fetch'])

    assert result.exit_code == 0

    assert 0 == result.exit_code

    assert maildir.check()

    for path in maildir.join('planet-debian').join('new').visit():

        body = path.read()
@@ -105,7 +104,7 @@ def test_opml(tmpdir_factory, static_boundary): # noqa 
                                  'import',

                                  utils.find_test_file('simple.opml')])

    assert conf_path.check()

    assert result.exit_code == 0

    assert 0 == result.exit_code

    with open(utils.find_test_file('simple.ini')) as p:

        conf_dir.join('feed2exec.ini').read() == p.read()
@@ -114,7 +113,7 @@ def test_opml(tmpdir_factory, static_boundary): # noqa 
                                  'export',

                                  str(conf_dir.join('opml'))])

    assert conf_path.check()

    assert result.exit_code == 0

    assert 0 == result.exit_code

    with open(utils.find_test_file('simple.opml')) as p:

        p.read() == conf_dir.join('opml').read()
@@ -143,7 +142,7 @@ def test_planet(tmpdir_factory, static_boundary, betamax_session): # noqa 
                                  '--database', str(db_path),

                                  'fetch'],

                           obj=betamax_session, catch_exceptions=False)

    assert result.exit_code == 0

    assert 0 == result.exit_code

    r = re.compile('User-Agent: .*$', flags=re.MULTILINE)

    with open(utils.find_test_file('../cassettes/planet-debian.mbx')) as expected:  # noqa

        expected = r.sub('', expected.read())

feed2exec/tests/test_plugins.py

+11 −11
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ def test_email(tmpdir, test_db, static_boundary, betamax): # noqa 
            actual = r.sub('', tmpdir.join('Mail', folder).read())

            expect = r.sub('', expected.read())

            assert actual

            assert actual == expect

            assert expect == actual

    assert path
@@ -139,7 +139,7 @@ def test_echo(capfd): 
                       item=item)

    assert e.called

    out, err = capfd.readouterr()

    assert out == """arguments received: ('foo', 'bar')\n"""

    assert """arguments received: ('foo', 'bar')\n""" == out





def test_error():
@@ -154,20 +154,20 @@ def test_exec(capfd): 
                             'args': 'seq 1'},

                       item={})

    out, err = capfd.readouterr()

    assert out == "1\n"

    assert e == 0

    assert "1\n" == out

    assert 0 == e





def test_filter():

    item = {'title': 'test'}

    copy = item.copy()

    expected = item.copy()

    p = plugins.filter(feed={'filter': 'feed2exec.plugins.echo'}, item=item)

    assert item == copy

    assert expected == item

    assert p

    assert p.called is not None

    item = {'title': 'test'}

    plugins.filter(feed={'filter': 'feed2exec.plugins.null'}, item=item)

    assert item != copy

    assert expected != item

    assert p.called is not None
@@ -185,8 +185,8 @@ def test_wayback(capfd, betamax): # noqa 
            break

    else:  # sanity check

        raise AttributeError('no wayback logs generated?')  # pragma: nocover

    assert record.levelname == 'INFO'

    assert record.msg == 'URL %s saved to wayback machine: %s'

    assert 'INFO' == record.levelname

    assert 'URL %s saved to wayback machine: %s' == record.msg

    handler.buffer = []

    item = feedparser.FeedParserDict({'link': 'http://example.com/404'})

    e = plugins.output(feed={'output': 'feed2exec.plugins.wayback'},
@@ -197,6 +197,6 @@ def test_wayback(capfd, betamax): # noqa 
            break

    else:  # sanity check

        raise AttributeError('no wayback logs generated?')  # pragma: nocover

    assert record.levelname == 'WARNING'

    assert record.msg == 'wayback machine failed to save URL %s, status %d'

    assert 'WARNING' == record.levelname

    assert 'wayback machine failed to save URL %s, status %d' == record.msg

    handler.buffer = []