Remove failing test now showing on travis.

jupyter · Dec 2, 2015 · a5eb3df · a5eb3df
1 parent b9595d9
commit a5eb3df
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/nbdime/tests/test_merge.py b/nbdime/tests/test_merge.py
@@ -1,12 +1,6 @@
 
-import pytest
-
 from nbdime import merge
 
-@pytest.xfail
-def test_fail():
-    assert False
-
 def test_shallow_merge_dicts_delete():
     # local removes an entry
     b = {"b":1, "a":3}

diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,3 @@
 six
 nbformat
+python-coveralls