[tracker: 2/3] functional-tests: Don't require 'guarantee-metadata' for some tests

[Sam Thursfield <sthursfield src gnome org>]

commit f515694d75aa1638bdf2125b21e068d1181e7dc1
Author: Sam Thursfield <sam afuera me uk>
Date:   Fri Dec 26 22:41:42 2014 +0000

    functional-tests: Don't require 'guarantee-metadata' for some tests
    
    Tests shouldn't break just because --enable-guarantee-metadata is not
    specified at configure time. This feature is off by default so we
    shouldn't depend on it. See GB#733536.

 .../functional-tests/common/utils/writebacktest.py |    2 +-
 .../test-extraction-data/images/roi.expected       |    1 -
 .../test-extraction-data/images/roi2.expected      |    1 -
 3 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/tests/functional-tests/common/utils/writebacktest.py 
b/tests/functional-tests/common/utils/writebacktest.py
index ce6f2c7..801434a 100644
--- a/tests/functional-tests/common/utils/writebacktest.py
+++ b/tests/functional-tests/common/utils/writebacktest.py
@@ -83,7 +83,7 @@ class CommonTrackerWritebackTest (ut.TestCase):
             # tracker-extract. The extractor adds nie:contentCreated for
             # image resources, so know once this property is set the
             # extraction is complete.
-            self.system.store.await_resource_inserted('nfo:Image', url=url, 
required_property='nie:contentCreated')
+            self.system.store.await_resource_inserted('nfo:Image', url=url, required_property='nfo:width')
 
         await_resource_extraction (self.get_test_filename_jpeg())
         await_resource_extraction (self.get_test_filename_tiff())
diff --git a/tests/functional-tests/test-extraction-data/images/roi.expected 
b/tests/functional-tests/test-extraction-data/images/roi.expected
index 65d1331..7f8d879 100644
--- a/tests/functional-tests/test-extraction-data/images/roi.expected
+++ b/tests/functional-tests/test-extraction-data/images/roi.expected
@@ -6,7 +6,6 @@ Comment=JPG with regions of interest in the XMP
 [Metadata]
 a=nfo:Image
 a=nmm:Photo
-nie_title=roi
 nfo_hasRegionOfInterest= URNUUID@
 nfo_width=128
 nfo_height=128
diff --git a/tests/functional-tests/test-extraction-data/images/roi2.expected 
b/tests/functional-tests/test-extraction-data/images/roi2.expected
index c4e06c8..52cf252 100644
--- a/tests/functional-tests/test-extraction-data/images/roi2.expected
+++ b/tests/functional-tests/test-extraction-data/images/roi2.expected
@@ -7,7 +7,6 @@ ExpectedFailure=
 [Metadata]
 a=nfo:Image
 a=nmm:Photo
-nie_title=roi2
 nfo_hasRegionOfInterest= URNUUID@
 nfo_width=128
 nfo_height=128