Skip to content

Commit fac8b84

Browse files
authored
Merge pull request #869 from RDFLib/no-skip-test
cleanup test-skipping
2 parents 7abed61 + 668de4f commit fac8b84

12 files changed

+6
-62
lines changed

test/test_conventions.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def module_names(self, path=None, names=None):
2727

2828
for importer, name, ispkg in pkgutil.iter_modules([path]):
2929
if ispkg:
30-
result = self.module_names(path=os.path.join(path, name),
30+
result = self.module_names(path=os.path.join(path, name),
3131
names=names)
3232
names.union(result)
3333
else:
@@ -39,13 +39,5 @@ def test_module_names(self):
3939
names = self.module_names()
4040
self.assertTrue(names==set(), "module names '%s' are not lower case" % names)
4141

42-
try:
43-
getattr(pkgutil, 'iter_modules')
44-
except AttributeError:
45-
from nose import SkipTest
46-
raise SkipTest('pkgutil.iter_modules not available in Python 2.4')
47-
48-
4942
if __name__ == "__main__":
5043
unittest.main()
51-

test/test_core_sparqlstore.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
import unittest
2-
try:
3-
import SPARQLWrapper
4-
except ImportError:
5-
from nose.exc import SkipTest
6-
raise SkipTest("SPARQLWrapper not installed")
7-
82
from rdflib.graph import Graph
93

10-
114
class TestSPARQLStoreGraphCore(unittest.TestCase):
125

136
store_name = 'SPARQLStore'

test/test_datetime.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ def test_equality(self):
1919
self.assertEqual(x == x, True)
2020

2121
def test_microseconds(self):
22-
import platform
23-
if platform.system() == 'Java' or (platform.system() != 'Java' and sys.version_info[:2] == (2, 5)):
24-
from nose import SkipTest
25-
raise SkipTest('datetime microseconds unsupported in Python2.5 and Jython')
2622
dt1 = datetime(2009, 6, 15, 23, 37, 6, 522630)
2723
l = Literal(dt1)
2824

test/test_finalnewline.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ def testFinalNewline():
99
http://code.google.com/p/rdflib/issues/detail?id=5
1010
"""
1111
import sys
12-
import platform
13-
if getattr(sys, 'pypy_version_info', None) or platform.system() == 'Java':
14-
from nose import SkipTest
15-
raise SkipTest(
16-
'Testing under pypy and Jython2.5 fails to detect that ' + \
17-
'IOMemory is a context_aware store')
1812

1913
graph=ConjunctiveGraph()
2014
graph.add((URIRef("http://ex.org/a"),

test/test_issue084.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,21 +86,13 @@ def test_e():
8686

8787
def test_xml_a():
8888
"""Test reading XML from a unicode object as data"""
89-
import platform
90-
if platform.system() == 'Java':
91-
from nose import SkipTest
92-
raise SkipTest('unicode issue for Jython2.5')
9389
g = Graph()
9490
g.parse(data=rdfxml, format='xml')
9591
v = g.value(subject=URIRef("http://www.test.org/#CI"), predicate=URIRef("http://www.w3.org/2004/02/skos/core#prefLabel"))
9692
assert v==Literal(u"C\u00f4te d'Ivoire", lang='fr')
9793

9894
def test_xml_b():
9995
"""Test reading XML from a utf8 encoded string object as data"""
100-
import platform
101-
if platform.system() == 'Java':
102-
from nose import SkipTest
103-
raise SkipTest('unicode issue for Jython2.5')
10496
g = Graph()
10597
g.parse(data=rdfxml_utf8, format='xml')
10698
v = g.value(subject=URIRef("http://www.test.org/#CI"), predicate=URIRef("http://www.w3.org/2004/02/skos/core#prefLabel"))
@@ -123,10 +115,6 @@ def test_xml_b():
123115

124116
def test_xml_e():
125117
"""Test reading XML from a BytesIO created from utf8 encoded string"""
126-
import platform
127-
if platform.system() == 'Java':
128-
from nose import SkipTest
129-
raise SkipTest('unicode issue for Jython2.5')
130118
g = Graph()
131119
g.parse(source=BytesIO(rdfxml_utf8), format='xml')
132120
v = g.value(subject=URIRef("http://www.test.org/#CI"), predicate=URIRef("http://www.w3.org/2004/02/skos/core#prefLabel"))

test/test_issue160.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
from rdflib import ConjunctiveGraph
33
from rdflib import Namespace, Literal
44
from rdflib.collection import Collection
5-
from nose.exc import SkipTest
6-
7-
85

96
target1xml = """\
107
<?xml version="1.0" encoding="utf-8"?>
@@ -78,5 +75,3 @@ def test_collection_render(self):
7875
# resxml = g.serialize(format="pretty-xml")
7976
# # print(resxml)
8077
# self.assertEqual(g.isomorphic(target2), True)
81-
82-

test/test_issue190.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@ def test2():
5252
graph.parse(StringInputSource(prefix + '<http://example.org/>' + meta2), format='n3')
5353

5454
from nose import SkipTest
55-
raise SkipTest("Known issue, with newlines in text")
55+
raise SkipTest("Known issue, with newlines in text")

test/test_issue248.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import rdflib
2-
from nose.exc import SkipTest
32
import unittest
43

54

test/test_issue363.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import rdflib
2-
from nose import SkipTest
32
from nose.tools import assert_raises
43

54
data = '''<?xml version="1.0" encoding="utf-8"?>

test/test_n3_suite.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
def _get_test_files_formats():
1010
skiptests = [
11-
'strquot.n3',
1211
]
1312
for f in os.listdir('test/n3'):
1413
if f not in skiptests:

0 commit comments

Comments
 (0)