Skip to content

Commit

Permalink
Add xfail marked test to test travis.
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Sandve Alnæs committed Dec 2, 2015
1 parent c53ba63 commit 2eaa586
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions nbdime/tests/test_merge.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@

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}
Expand Down

0 comments on commit 2eaa586

Please sign in to comment.