[tracker-miners/sam/test-runner-fix: 20/21] functional-tests: Remove obsolete expectedFailure annotations

[Sam Thursfield <sthursfield src gnome org>]

commit 65162a719e90bc22ca5415aa5229f8b932b96a5a
Author: Sam Thursfield <sam afuera me uk>
Date:   Mon Jan 14 13:43:04 2019 +0100

    functional-tests: Remove obsolete expectedFailure annotations
    
    The custom expectedFailure annotations are now removed (the
    unittest.expectedFailure class can be used if needed).
    
    The writeback tests which were failing were actually broken due to a
    typo in the testcase, not due to a bug in tracker-writeback.

 tests/functional-tests/500-writeback.py            | 15 ++---
 tests/functional-tests/501-writeback-details.py    |  1 -
 .../common/utils/expectedFailure.py                | 68 ----------------------
 3 files changed, 5 insertions(+), 79 deletions(-)
---
diff --git a/tests/functional-tests/500-writeback.py b/tests/functional-tests/500-writeback.py
index 3d3888fd3..71ce8c766 100755
--- a/tests/functional-tests/500-writeback.py
+++ b/tests/functional-tests/500-writeback.py
@@ -28,7 +28,6 @@ from common.utils.extractor import get_tracker_extract_jsonld_output
 from common.utils.helpers import log
 from common.utils.writebacktest import CommonTrackerWritebackTest as CommonTrackerWritebackTest
 import unittest as ut
-from common.utils.expectedFailure import expectedFailureBug
 
 REASONABLE_TIMEOUT = 5 # Seconds we wait for tracker-writeback to do the work
 
@@ -139,25 +138,21 @@ class WritebackBasicDataTest (CommonTrackerWritebackTest):
         
 
     # PNG tests
-    @expectedFailureBug ("NB#185070")
     def test_021_png_title (self):
         FILENAME = "test-writeback-monitored/writeback-test-4.png"
-        self.__writeback_test (self.get_test_filaname_png (), "image/png", "nie:title")
+        self.__writeback_test (self.get_test_filename_png (), "image/png", "nie:title")
 
-    @expectedFailureBug ("NB#185070")
     def test_022_png_description (self):
         FILENAME = "test-writeback-monitored/writeback-test-4.png"
-        self.__writeback_test (self.get_test_filaname_png (), "image/png", "nie:description")
-        
-    #@expectedFailureBug ("NB#185070")
+        self.__writeback_test (self.get_test_filename_png (), "image/png", "nie:description")
+
     #def test_023_png_keyword (self):
     #    FILENAME = "test-writeback-monitored/writeback-test-4.png"
-    #    self.__writeback_test (self.get_test_filaname_png (), "image/png", "nie:keyword", 
"nao:hasTag:prefLabel")
+    #    self.__writeback_test (self.get_test_filename_png (), "image/png", "nie:keyword", 
"nao:hasTag:prefLabel")
 
-    #@expectedFailureBug("NB#185070")
     #def test_024_png_hasTag (self):
     #    FILENAME = "test-writeback-monitored/writeback-test-4.png"
-    #    self.__writeback_hasTag_test (self.get_test_filaname_png (), "image/png")
+    #    self.__writeback_hasTag_test (self.get_test_filename_png (), "image/png")
 
 if __name__ == "__main__":
     ut.main (failfast=True)
diff --git a/tests/functional-tests/501-writeback-details.py b/tests/functional-tests/501-writeback-details.py
index 83a5518c6..90a8b80c9 100755
--- a/tests/functional-tests/501-writeback-details.py
+++ b/tests/functional-tests/501-writeback-details.py
@@ -21,7 +21,6 @@ from common.utils.writebacktest import CommonTrackerWritebackTest as CommonTrack
 from common.utils.extractor import get_tracker_extract_jsonld_output
 from common.utils.helpers import log
 import unittest as ut
-from common.utils.expectedFailure import expectedFailureBug
 import os
 import time