Merge pull request #3 from davidszotten/fixes

Fixes

Makefile

@@ -4,7 +4,10 @@ noop:
 .PHONY: noop
 
 pytest:
-	coverage run --source pytest_cagoule -m pytest --cagoule-capture tests
+	coverage erase
+	coverage run -p --source pytest_cagoule -m pytest tests
+	coverage run -p --source pytest_cagoule -m pytest --cagoule-capture tests
+	coverage combine
 	coverage report --show-missing
 
 flake8:

pytest_cagoule/db.py

@@ -10,4 +10,5 @@ def db_exists():
 
 def get_connection():
     connection = sqlite3.connect(DB_FILE)
+    connection.text_factory = bytes
     return connection

pytest_cagoule/plugin.py

@@ -100,7 +100,7 @@ def write_results(self, nodeid, cov_data):
             self.filename_values(cov_data)
         )
         connection.executemany(
-            "INSERT INTO coverage VALUES (?, ?, ?)",
+            "REPLACE INTO coverage VALUES (?, ?, ?)",
             self.coverage_values(nodeid, cov_data)
         )
 

pytest_cagoule/select.py

@@ -13,8 +13,6 @@
 
 def parse_spec(spec):
     match = spec_re.match(spec)
-    if match is None:
-        return []
     matches = match.groupdict()
 
     filename = matches['filename']

tests/test_plugin.py

@@ -1,6 +1,10 @@
+# coding: utf-8
+
 from functools import partial
 import sqlite3
 
+import pytest
+
 from pytest_cagoule import db
 from pytest_cagoule import select
 
@@ -23,3 +27,15 @@ def test_foo():
     get_connection = partial(get_test_connection, testdir)
     monkeypatch.setattr(select, 'get_connection', get_connection)
     assert select.get_node_ids([str(test_file)]) == ['test_basic.py::test_foo']
+
+
+@pytest.mark.parametrize('val', ('foo', 'föö'))
+def test_nonascii(val):
+    # make sure plugin captures nodeid ok
+    pass
+
+
+@pytest.mark.parametrize('val', ('1', 1))
+def test_same_as_strings(val):
+    # make sure plugin captures nodeid ok
+    pass

tests/test_select.py

@@ -24,7 +24,8 @@ def test_line_get_line_number_filter(
         (
             '/tmp/foo.py:3-5',
             'filename = ? AND (line = ? OR line = ? OR line = ?)',
-            ('/tmp/foo.py', 3, 4, 5)),
+            ('/tmp/foo.py', 3, 4, 5),
+        ),
     )
 )
 def test_get_spec_filter(spec, expected_query, expected_params):