diff options
| -rw-r--r-- | rdflib/store/FOPLRelationalModel/QuadSlot.py | 2 | ||||
| -rw-r--r-- | setup.cfg | 5 | ||||
| -rw-r--r-- | test/test_bdb_transaction.py | 7 | ||||
| -rw-r--r-- | test/test_context.py | 2 | ||||
| -rw-r--r-- | test/test_datatype_encoding_mysql.py | 6 | ||||
| -rw-r--r-- | test/test_graph.py | 4 | ||||
| -rw-r--r-- | test/test_rdfxml.py | 2 | ||||
| -rw-r--r-- | test/test_sleepycat.py | 7 | ||||
| -rw-r--r-- | test/test_sparql.py | 1 |
9 files changed, 18 insertions, 18 deletions
diff --git a/rdflib/store/FOPLRelationalModel/QuadSlot.py b/rdflib/store/FOPLRelationalModel/QuadSlot.py index d778ab4d..e45adb7c 100644 --- a/rdflib/store/FOPLRelationalModel/QuadSlot.py +++ b/rdflib/store/FOPLRelationalModel/QuadSlot.py @@ -61,7 +61,7 @@ def normalizeValue(value,termType): value = u'http://www.w3.org/2002/07/owl#NothingU' else: value = (isinstance(value,Graph) and value.identifier or str(value)) + termType - return int(md5.new(isinstance(value,unicode) and value.encode('utf-8') or value).hexdigest()[:16],16) + return int(md5(isinstance(value,unicode) and value.encode('utf-8') or value).hexdigest()[:16],16) def normalizeNode(node): return normalizeValue(node, term2Letter(node)) @@ -3,9 +3,10 @@ tag_build = .dev tag_svn_revision = 1 [nosetests] + +attr = !known_issue,!slow,!non_core,!sparql verbosity = 2 -with-doctest = 1 -exclude = (.*(store|mysql).*) +#with-doctest = 1 diff --git a/test/test_bdb_transaction.py b/test/test_bdb_transaction.py index edd6d6e9..421036e1 100644 --- a/test/test_bdb_transaction.py +++ b/test/test_bdb_transaction.py @@ -51,17 +51,16 @@ def worker_remove(performed_ops, graph, num_ops, input=[]): class TestBDBGraph(test_graph.GraphTestCase): store_name = "BerkeleyDB" - slowtest = True + non_core = True class TestBDBContext(test_context.ContextTestCase): store = "BerkeleyDB" - slowtest = True + non_core = True class TestBDBTransactions(unittest.TestCase): - - slowtest = True + non_core = True def setUp(self): self.graph = ConjunctiveGraph(store="BerkeleyDB") diff --git a/test/test_context.py b/test/test_context.py index 4b0195da..36ca49a3 100644 --- a/test/test_context.py +++ b/test/test_context.py @@ -7,7 +7,7 @@ from rdflib.term import URIRef, BNode class ContextTestCase(unittest.TestCase): #store = 'Memory' store = 'default' - slowtest = True + slow = True def setUp(self): self.graph = ConjunctiveGraph(store=self.store) diff --git a/test/test_datatype_encoding_mysql.py b/test/test_datatype_encoding_mysql.py index ff1bab50..005b0182 100644 --- a/test/test_datatype_encoding_mysql.py +++ b/test/test_datatype_encoding_mysql.py @@ -6,7 +6,7 @@ from rdflib.term import Literal from rdflib.store import Store from rdflib.graph import Graph -#from rdflib.store.FOPLRelationalModel.QuadSlot import * +from rdflib.store.FOPLRelationalModel.QuadSlot import normalizeValue def test_dType_encoding(): correct=normalizeValue('http://www.w3.org/2001/XMLSchema#integer', 'U') @@ -33,6 +33,10 @@ def test_dType_encoding(): store.rollback() store.close() +test_dType_encoding.non_core = True +test_dType_encoding.mysql = True + + if __name__ == '__main__': test_dType_encoding() diff --git a/test/test_graph.py b/test/test_graph.py index 190ab977..d340b65f 100644 --- a/test/test_graph.py +++ b/test/test_graph.py @@ -173,10 +173,6 @@ class GraphTestCase(unittest.TestCase): self.assertEquals(False, graph.connected()) -#class MemoryGraphTestCase(GraphTestCase): -# store_name = "Memory" -# slowtest = False - if __name__ == '__main__': unittest.main() diff --git a/test/test_rdfxml.py b/test/test_rdfxml.py index c8e9b4e8..a0bdd03a 100644 --- a/test/test_rdfxml.py +++ b/test/test_rdfxml.py @@ -115,7 +115,7 @@ def _testNegative(uri, manifest): class ParserTestCase(unittest.TestCase): store = 'default' path = 'store' - slowtest = True + slow = True def setUp(self): self.manifest = manifest = Graph(store=self.store) diff --git a/test/test_sleepycat.py b/test/test_sleepycat.py index 40daefab..8e88675d 100644 --- a/test/test_sleepycat.py +++ b/test/test_sleepycat.py @@ -8,9 +8,10 @@ from test import test_context class SleepycatGraphTestCase(test_graph.GraphTestCase): store_name = "Sleepycat" - slowtest = True - + non_core = True + bsddb = True class SleepycatStoreTestCase(test_context.ContextTestCase): store = "Sleepycat" - slowtest = True + non_core = True + bsddb = True diff --git a/test/test_sparql.py b/test/test_sparql.py index 7f653291..75785ce7 100644 --- a/test/test_sparql.py +++ b/test/test_sparql.py @@ -3,7 +3,6 @@ import unittest from rdflib import term from rdflib.graph import Graph - class FakeBlankNode(object): def __cmp__(self, other): if other.__class__ == term.BNode: |