Skip to content

Commit 0f7a5ca

Browse files
committed
Use pytest.skip instead of SkipTest.
1 parent 59cdc08 commit 0f7a5ca

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

.travis.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ python:
55
- "3.2"
66
- "3.3"
77

8-
matrix:
9-
allow_failures:
10-
# 2.6 doesn't have SkipTest, so it's going to fail.
11-
- python: 2.6
12-
138
install:
149
- "bash .travis.install"
1510
- "pip install pytest coveralls pytz ."

ometa/test/test_pymeta.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#from __future__ import unicode_literals
22

33
import operator
4-
import sys
54
from textwrap import dedent
6-
import unittest
5+
6+
import pytest
77

88
from ometa.grammar import OMeta, TermOMeta, TreeTransformerGrammar
99
from ometa.compat import OMeta1
@@ -1271,7 +1271,7 @@ def doIt(s):
12711271
"""
12721272
tree = not isinstance(s, basestring)
12731273
if tree:
1274-
raise unittest.SkipTest("Not applicable for push parsing")
1274+
pytest.skip("Not applicable for push parsing")
12751275
results = []
12761276
def whenDone(val, err):
12771277
results.append(val)

0 commit comments

Comments
 (0)