TST: mark failing tests as xfail

tests/test_name_properties.py

@@ -27,7 +27,7 @@
 """
 
 import caosdb as db
-from pytest import raises
+from pytest import raises, mark
 from nose.tools import nottest, assert_true, assert_raises, assert_equal, with_setup, assert_is_not_none  # @UnresolvedImport
 
 
@@ -208,7 +208,7 @@ def test_recordtype_query():
         test_recordtpye_insertion_with_indirect_child_with_existing_parent, [
             "FIND TestRecordType", "FIND TestRT"])
 
-
+@mark.xfail(reason="waiting for server, mysqlbackend merges of f-name-query")
 def test_query_name_property():
     """ Insert a Property which has a name parent. Add to Record and query the
     record."""

tests/test_query.py

@@ -29,6 +29,7 @@
 
 import caosdb as h
 
+from pytest import mark
 from nose.tools import assert_true, assert_equal, assert_is_not_none
 from caosdb.connection.connection import get_connection
 from lxml import etree
@@ -968,6 +969,7 @@ def test_backref_like():
     h.execute_query("FIND ENTITY WHICH IS REFERENCED BY *e", unique=True)
 
 
+@mark.xfail(reason="waiting for server, mysqlbacken merges of f-query-name")
 def test_query_by_name():
     rt = h.RecordType("TestRT").insert()
     rec1 = h.Record("TestRec1").add_parent("TestRT").insert()