Switch to pytest for the tests

Author: ncrocfer

.travis.yml

@@ -1,10 +1,16 @@
+os: linux
+dist: xenial
 language: python
-
 python:
-  - "2.7"
-  - "3.3"
-  - "3.4"
+  - "3.7"
+  - "3.6"
   - "3.5"
+  - "3.4"
+  - "2.7"
+env: TOXENV=py
+
+install:
+  - pip install tox
 
-install: "pip install -r requirements.txt"
-script: nosetests
+script:
+  - tox

setup.py

@@ -19,6 +19,12 @@
     packages=['whatportis'],
     include_package_data=True,
     install_requires=requirements,
+    extras_require={
+        "dev": [
+            "pytest",
+            "tox"
+        ]
+    },
     entry_points=entry_points,
     classifiers=(
         'Development Status :: 5 - Production/Stable',

tests/__init__.py

@@ -0,0 +1,7 @@
+import pytest
+from click.testing import CliRunner
+
+
+@pytest.fixture
+def runner():
+    return CliRunner()

tests/conftest.py

@@ -0,0 +1,51 @@
+import re
+
+from whatportis.__main__ import run
+
+
+def test_search_with_no_arg(runner):
+    result = runner.invoke(run, [])
+    regex = re.compile('^Usage:')
+    assert result.exit_code == 2
+    assert regex.match(result.output)
+
+
+def test_search_with_multiple_args(runner):
+    result = runner.invoke(run, ['foo', 'bar'])
+    regex = re.compile('^Usage:')
+    assert result.exit_code == 2
+    assert regex.match(result.output)
+
+
+def test_search_str_port(runner):
+    result = runner.invoke(run, ['redis'])
+    assert result.exit_code == 0
+    assert "redis" in result.output
+    assert "6379" in result.output
+    assert "tcp" in result.output
+    assert "An advanced key-value cache and store" in result.output
+
+
+def test_search_int_port(runner):
+    result = runner.invoke(run, ['3306'])
+    assert result.exit_code == 0
+    assert result.output.count('mysql') == 1
+    assert result.output.count('3306') == 1
+    assert "tcp" in result.output
+    assert "udp" in result.output
+
+
+def test_search_str_like_port(runner):
+    result = runner.invoke(run, ['mysql', '--like'])
+    assert result.exit_code == 0
+    assert result.output.count('mysql') == 6
+    assert result.output.count('tcp') == 6
+    assert result.output.count('udp') == 5
+
+
+def test_search_int_like_port(runner):
+    result = runner.invoke(run, ['3306', '--like'])
+    assert result.exit_code == 0
+    assert result.output.count('mysql') == 2
+    assert result.output.count('tcp') == 2
+    assert result.output.count('udp') == 2

tests/test_cli.py

@@ -0,0 +1,38 @@
+from whatportis.core import merge_protocols
+
+
+def test_merge_protocols_different_ports():
+    ports = [{
+        "description": "My description 1",
+        "name": "MyName 1",
+        "port": "1234",
+        "protocol": "udp"
+    }, {
+        "description": "My description 2",
+        "name": "MyName 2",
+        "port": "5678",
+        "protocol": "tcp"
+    }]
+    result = merge_protocols(ports)
+    assert sorted(result, key=lambda p: p["name"]) == sorted(ports, key=lambda p: p["name"])
+
+
+def test_merge_protocols_same_port():
+    ports = [{
+        "description": "My description",
+        "name": "MyName",
+        "port": "1234",
+        "protocol": "udp"
+    }, {
+        "description": "My description",
+        "name": "MyName",
+        "port": "1234",
+        "protocol": "tcp"
+    }]
+    result = merge_protocols(ports)
+    assert result == [{
+        "description": "My description",
+        "name": "MyName",
+        "port": "1234",
+        "protocol": "udp, tcp"
+    }]

tests/test_utils.py

@@ -1,7 +1,8 @@
 [tox]
-envlist = py27,py33,py34,py35
+envlist = py{27,33,34,35,36,37}
 
 [testenv]
-deps=-rrequirements.txt
-commands =
-    python tests/test_whatportis.py
+deps=
+    pytest
+    -rrequirements.txt
+commands = pytest