Merge pull request #110 from vidartf/fix-tests

Fix warnings + test

Author: vidartf

nbval/cover.py

@@ -5,6 +5,7 @@
 
 import os
 import coverage
+import warnings
 
 
 # Coverage setup/teardown code to run in kernel
@@ -66,10 +67,12 @@ def setup_coverage(config, kernel, floc, output_loc=None):
         msg_id = kernel.kc.execute(cmd, stop_on_error=False)
         kernel.await_idle(msg_id, 60)  # A minute should be plenty to enable coverage
     else:
-        config.warn(
-            'C1',
-            'Coverage currently not supported for language "%s".' % language,
-            floc)
+        warnings.warn_explicit(
+            'Coverage currently not supported for language %r.' % language,
+            category=UserWarning,
+            filename=floc[0] if floc else '',
+            lineno=0
+        )
         return
 
 

nbval/plugin.py

@@ -288,18 +288,23 @@ def collect(self):
                 with warnings.catch_warnings(record=True) as ws:
                     options = defaultdict(bool, find_metadata_tags(cell.metadata))
                     comment_opts = dict(find_comment_markers(cell.source))
-                    if set(comment_opts.keys()) & set(options.keys()):
-                        warnings.warn(
-                            "Overlapping options from comments and metadata, "
-                            "using options from comments: %s" %
-                            str(set(comment_opts.keys()) & set(options.keys())))
-                    for w in ws:
-                        self.parent.config.warn(
-                            "C1",
-                            str(w.message),
-                            '%s:Cell %d' % (
-                                getattr(self, "fspath", None),
-                                cell_num))
+                loc = '%s:Cell %d' % (getattr(self, "fspath", None), cell_num)
+                if set(comment_opts.keys()) & set(options.keys()):
+                    warnings.warn_explicit(
+                        "Overlapping options from comments and metadata, "
+                        "using options from comments: %s" %
+                        str(set(comment_opts.keys()) & set(options.keys())),
+                        category=UserWarning,
+                        filename=loc,
+                        lineno=0
+                    )
+                for w in ws:
+                    warnings.warn_explicit(
+                        str(w.message),
+                        category=UserWarning,
+                        filename=loc,
+                        lineno=0
+                    )
                 options.update(comment_opts)
                 options.setdefault('check', self.compare_outputs)
                 yield IPyNbCell('Cell ' + str(cell_num), self, cell_num,

tests/test_coverage.py

@@ -8,7 +8,7 @@
 pytest_plugins = "pytester"
 
 
-_re_coverage_report_line = re.compile('^(\w)\s*(\d+)\s*(\d+)\s*(\d+)%$')
+_re_coverage_report_line = re.compile(r'^(\w)\s*(\d+)\s*(\d+)\s*(\d+)%$')
 
 
 def test_coverage(testdir):
@@ -49,7 +49,7 @@ def test_sum():
     result = testdir.runpytest_inprocess('--nbval', '--current-env', '--cov', '.')
 
     # Check tests went off as they should:
-    result.ret == 0
+    assert result.ret == 0
 
     # Ensure coverage report was generated:
     assert os.path.exists(os.path.join(str(testdir.tmpdir), '.coverage'))