[tracker-miners/sam/ft-python2.7] functional-tests: Remove bundled unittest2 library
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners/sam/ft-python2.7] functional-tests: Remove bundled unittest2 library
- Date: Sat, 5 Jan 2019 15:05:06 +0000 (UTC)
commit 029fdadcce35f1e4c764e9736d9ecb25e9d5c506
Author: Sam Thursfield <sam afuera me uk>
Date: Sat Jan 5 16:03:34 2019 +0100
functional-tests: Remove bundled unittest2 library
This removes support for running the tests with Python 2.6 and older.
tests/functional-tests/300-miner-basic-ops.py | 2 +-
.../functional-tests/301-miner-resource-removal.py | 2 +-
tests/functional-tests/310-fts-basic.py | 2 +-
tests/functional-tests/311-fts-file-operations.py | 2 +-
tests/functional-tests/312-fts-stopwords.py | 2 +-
tests/functional-tests/400-extractor-metadata.py | 2 +-
tests/functional-tests/410-extractor-decorator.py | 2 +-
tests/functional-tests/500-writeback.py | 2 +-
tests/functional-tests/501-writeback-details.py | 2 +-
tests/functional-tests/600-applications-camera.py | 2 +-
tests/functional-tests/601-applications-sync.py | 2 +-
tests/functional-tests/unittest2/__init__.py | 72 --
tests/functional-tests/unittest2/__main__.py | 14 -
tests/functional-tests/unittest2/case.py | 1058 --------------------
tests/functional-tests/unittest2/compatibility.py | 68 --
tests/functional-tests/unittest2/loader.py | 318 ------
tests/functional-tests/unittest2/main.py | 236 -----
tests/functional-tests/unittest2/result.py | 185 ----
tests/functional-tests/unittest2/runner.py | 208 ----
tests/functional-tests/unittest2/signals.py | 59 --
tests/functional-tests/unittest2/suite.py | 264 -----
tests/functional-tests/unittest2/unit2 | 8 -
tests/functional-tests/unittest2/unit2.py | 8 -
tests/functional-tests/unittest2/util.py | 94 --
24 files changed, 11 insertions(+), 2603 deletions(-)
---
diff --git a/tests/functional-tests/300-miner-basic-ops.py b/tests/functional-tests/300-miner-basic-ops.py
index 25076aba5..9a66eb740 100755
--- a/tests/functional-tests/300-miner-basic-ops.py
+++ b/tests/functional-tests/300-miner-basic-ops.py
@@ -29,7 +29,7 @@ import os
import shutil
import time
-import unittest2 as ut
+import unittest as ut
from common.utils.helpers import log
from common.utils.minertest import CommonTrackerMinerTest
diff --git a/tests/functional-tests/301-miner-resource-removal.py
b/tests/functional-tests/301-miner-resource-removal.py
index a99042ad8..678d21759 100755
--- a/tests/functional-tests/301-miner-resource-removal.py
+++ b/tests/functional-tests/301-miner-resource-removal.py
@@ -28,7 +28,7 @@ from common.utils.minertest import CommonTrackerMinerTest
from gi.repository import GLib
import os
-import unittest2 as ut
+import unittest as ut
NFO_DOCUMENT = 'http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#Document'
diff --git a/tests/functional-tests/310-fts-basic.py b/tests/functional-tests/310-fts-basic.py
index 47bd25c03..59bb4ae15 100755
--- a/tests/functional-tests/310-fts-basic.py
+++ b/tests/functional-tests/310-fts-basic.py
@@ -31,7 +31,7 @@ import shutil
import locale
import time
-import unittest2 as ut
+import unittest as ut
from common.utils.helpers import log
from common.utils.minertest import CommonTrackerMinerFTSTest, DEFAULT_TEXT
from common.utils import configuration as cfg
diff --git a/tests/functional-tests/311-fts-file-operations.py
b/tests/functional-tests/311-fts-file-operations.py
index 0b2916449..741e95b05 100755
--- a/tests/functional-tests/311-fts-file-operations.py
+++ b/tests/functional-tests/311-fts-file-operations.py
@@ -31,7 +31,7 @@ import shutil
import locale
import time
-import unittest2 as ut
+import unittest as ut
from common.utils.helpers import log
from common.utils.minertest import CommonTrackerMinerFTSTest, DEFAULT_TEXT
from common.utils import configuration as cfg
diff --git a/tests/functional-tests/312-fts-stopwords.py b/tests/functional-tests/312-fts-stopwords.py
index 10a07bd54..fdbbc04be 100755
--- a/tests/functional-tests/312-fts-stopwords.py
+++ b/tests/functional-tests/312-fts-stopwords.py
@@ -31,7 +31,7 @@ import shutil
import locale
import time
-import unittest2 as ut
+import unittest as ut
from common.utils.helpers import log
from common.utils.minertest import CommonTrackerMinerFTSTest, DEFAULT_TEXT
from common.utils import configuration as cfg
diff --git a/tests/functional-tests/400-extractor-metadata.py
b/tests/functional-tests/400-extractor-metadata.py
index aeff2e812..744c73fa2 100755
--- a/tests/functional-tests/400-extractor-metadata.py
+++ b/tests/functional-tests/400-extractor-metadata.py
@@ -26,7 +26,7 @@ directory (containing xxx.expected files)
from common.utils import configuration as cfg
from common.utils.extractor import get_tracker_extract_jsonld_output
-import unittest2 as ut
+import unittest as ut
import json
import os
import sys
diff --git a/tests/functional-tests/410-extractor-decorator.py
b/tests/functional-tests/410-extractor-decorator.py
index 046fd7c21..bed0d9b28 100755
--- a/tests/functional-tests/410-extractor-decorator.py
+++ b/tests/functional-tests/410-extractor-decorator.py
@@ -21,7 +21,7 @@
Tests failure cases of tracker-extract.
"""
-import unittest2 as ut
+import unittest as ut
from gi.repository import GLib
diff --git a/tests/functional-tests/500-writeback.py b/tests/functional-tests/500-writeback.py
index 53c19b474..f82bd8b42 100755
--- a/tests/functional-tests/500-writeback.py
+++ b/tests/functional-tests/500-writeback.py
@@ -27,7 +27,7 @@ import time
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 unittest2 as ut
+import unittest as ut
from common.utils.expectedFailure import expectedFailureBug
REASONABLE_TIMEOUT = 5 # Seconds we wait for tracker-writeback to do the work
diff --git a/tests/functional-tests/501-writeback-details.py b/tests/functional-tests/501-writeback-details.py
index fa87caa12..f0d33404c 100755
--- a/tests/functional-tests/501-writeback-details.py
+++ b/tests/functional-tests/501-writeback-details.py
@@ -20,7 +20,7 @@
from common.utils.writebacktest import CommonTrackerWritebackTest as CommonTrackerWritebackTest
from common.utils.extractor import get_tracker_extract_jsonld_output
from common.utils.helpers import log
-import unittest2 as ut
+import unittest as ut
from common.utils.expectedFailure import expectedFailureBug
import os
import time
diff --git a/tests/functional-tests/600-applications-camera.py
b/tests/functional-tests/600-applications-camera.py
index 1e4a3d217..e723dc6ab 100755
--- a/tests/functional-tests/600-applications-camera.py
+++ b/tests/functional-tests/600-applications-camera.py
@@ -25,7 +25,7 @@ Tests trying to simulate the behaviour of applications working with tracker
import os
import random
-import unittest2 as ut
+import unittest as ut
from common.utils.applicationstest import CommonTrackerApplicationTest as CommonTrackerApplicationTest
from common.utils.helpers import log
diff --git a/tests/functional-tests/601-applications-sync.py b/tests/functional-tests/601-applications-sync.py
index 488fb3a75..0287dc197 100755
--- a/tests/functional-tests/601-applications-sync.py
+++ b/tests/functional-tests/601-applications-sync.py
@@ -32,7 +32,7 @@ import shutil
import fcntl
from common.utils import configuration as cfg
-import unittest2 as ut
+import unittest as ut
from common.utils.applicationstest import CommonTrackerApplicationTest as CommonTrackerApplicationTest
from common.utils.helpers import log
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]