diff options
Diffstat (limited to 'tests/functional-tests/500-writeback.py')
| -rwxr-xr-x | tests/functional-tests/500-writeback.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tests/functional-tests/500-writeback.py b/tests/functional-tests/500-writeback.py index cd144a7e1..cdd2b06ab 100755 --- a/tests/functional-tests/500-writeback.py +++ b/tests/functional-tests/500-writeback.py @@ -24,6 +24,7 @@ on the files. Note that these tests are highly platform dependant. import os, dbus import time +from common.utils.extractor import get_tracker_extract_output from common.utils.writebacktest import CommonTrackerWritebackTest as CommonTrackerWritebackTest import unittest2 as ut from common.utils.expectedFailure import expectedFailureBug @@ -69,6 +70,10 @@ class WritebackBasicDataTest (CommonTrackerWritebackTest): the @prop is used. """ + # FIXME: filename is actually a URI! :( + filename_real = filename[len('file://'):] + initial_mtime = os.stat(filename_real).st_mtime + TEST_VALUE = prop.replace (":","") + "test" SPARQL_TMPL = """ INSERT { ?u %s '%s' } @@ -76,11 +81,10 @@ class WritebackBasicDataTest (CommonTrackerWritebackTest): """ self.__clean_property (prop, filename) self.tracker.update (SPARQL_TMPL % (prop, TEST_VALUE, filename)) - - # There is no way to know when the operation is finished - time.sleep (REASONABLE_TIMEOUT) - - results = self.extractor.get_metadata (filename, mimetype) + + self.wait_for_file_change(filename_real, initial_mtime) + + results = get_tracker_extract_output (filename, mimetype) keyDict = expectedKey or prop self.assertIn (TEST_VALUE, results[keyDict]) self.__clean_property (prop, filename, False) @@ -112,7 +116,7 @@ class WritebackBasicDataTest (CommonTrackerWritebackTest): time.sleep (REASONABLE_TIMEOUT) - results = self.extractor.get_metadata (filename, mimetype) + results = get_tracker_extract_output (filename, mimetype) self.assertIn ("testTag", results ["nao:hasTag"]) |