From ebaaad32a53d0532b8220c29d6d4665b38566f00 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Fri, 27 May 2016 14:00:32 +0000
Subject: [PATCH] Task #8437: Remove 'verbosity=2' from unittest.main() call to
support older clients (CEP2)
---
LCS/PyCommon/test/t_dbcredentials.py | 2 +-
LCS/PyCommon/test/t_methodtrigger.py | 2 +-
LTA/ltastorageoverview/test/test_lso_webservice.py | 2 +-
LTA/ltastorageoverview/test/test_store.py | 2 +-
MAC/Services/test/tPipelineControl.py | 2 +-
RTCP/Cobalt/GPUProc/test/t_generate_globalfs_locations.py | 2 +-
SAS/MoM/MoMQueryService/test/test_momqueryservice.py | 2 +-
.../RATaskSpecifiedService/test/tRATaskSpecified.py | 2 +-
.../RAtoOTDBTaskSpecificationPropagator/test/t_rotspservice.py | 2 +-
.../ResourceAssigner/test/t_resourceassigner.py | 2 +-
.../ResourceAssignmentEditor/test/test_webservice.py | 2 +-
.../ResourceAssignmentEstimator/test/t_resource_estimator.py | 2 +-
.../ResourceAssignmentService/test/test_ra_service_and_rpc.py | 2 +-
SAS/ResourceAssignment/Services/test/tRATaskSpecified.py | 2 +-
.../test/test_datamonitorqueueservice_and_rpc.py | 2 +-
15 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/LCS/PyCommon/test/t_dbcredentials.py b/LCS/PyCommon/test/t_dbcredentials.py
index b5e8db69c45..8c2d131d127 100644
--- a/LCS/PyCommon/test/t_dbcredentials.py
+++ b/LCS/PyCommon/test/t_dbcredentials.py
@@ -95,7 +95,7 @@ database = mydb
def main(argv):
- unittest.main(verbosity=2)
+ unittest.main()
if __name__ == "__main__":
# run all tests
diff --git a/LCS/PyCommon/test/t_methodtrigger.py b/LCS/PyCommon/test/t_methodtrigger.py
index 5b96ebcf6de..a7562ad5ac5 100644
--- a/LCS/PyCommon/test/t_methodtrigger.py
+++ b/LCS/PyCommon/test/t_methodtrigger.py
@@ -115,7 +115,7 @@ class TestArgs(unittest.TestCase):
self.assertEqual(self.trigger.kwargs, {"c": 3, "d": 4})
def main(argv):
- unittest.main(verbosity=2)
+ unittest.main()
if __name__ == "__main__":
# run all tests
diff --git a/LTA/ltastorageoverview/test/test_lso_webservice.py b/LTA/ltastorageoverview/test/test_lso_webservice.py
index 6cc2e2e2527..4831f3bec65 100755
--- a/LTA/ltastorageoverview/test/test_lso_webservice.py
+++ b/LTA/ltastorageoverview/test/test_lso_webservice.py
@@ -117,7 +117,7 @@ class TestLTAStorageWebService(FlaskLiveTestCase):
def main(argv):
- unittest.main(verbosity=2)
+ unittest.main()
# run tests if main
if __name__ == '__main__':
diff --git a/LTA/ltastorageoverview/test/test_store.py b/LTA/ltastorageoverview/test/test_store.py
index d95c318f37c..30b08fa0325 100755
--- a/LTA/ltastorageoverview/test/test_store.py
+++ b/LTA/ltastorageoverview/test/test_store.py
@@ -128,4 +128,4 @@ class TestLTAStorageDb(unittest.TestCase):
# run tests if main
if __name__ == '__main__':
- unittest.main(verbosity=2)
+ unittest.main()
diff --git a/MAC/Services/test/tPipelineControl.py b/MAC/Services/test/tPipelineControl.py
index 31d281b80d7..03283a0b385 100644
--- a/MAC/Services/test/tPipelineControl.py
+++ b/MAC/Services/test/tPipelineControl.py
@@ -261,7 +261,7 @@ class TestPipelineControl(unittest.TestCase):
self.assertTrue(False, "--begin parameter not given to SLURM job")
def main(argv):
- unittest.main(verbosity=2)
+ unittest.main()
if __name__ == "__main__":
# run all tests
diff --git a/RTCP/Cobalt/GPUProc/test/t_generate_globalfs_locations.py b/RTCP/Cobalt/GPUProc/test/t_generate_globalfs_locations.py
index cef56e81940..f21c5e083e8 100644
--- a/RTCP/Cobalt/GPUProc/test/t_generate_globalfs_locations.py
+++ b/RTCP/Cobalt/GPUProc/test/t_generate_globalfs_locations.py
@@ -45,7 +45,7 @@ class ProcessParset(unittest.TestCase):
self.assertTrue(l.startswith("foo:") or l.startswith("bar:"))
def main(argv):
- unittest.main(verbosity=2)
+ unittest.main()
if __name__ == "__main__":
# run all tests
diff --git a/SAS/MoM/MoMQueryService/test/test_momqueryservice.py b/SAS/MoM/MoMQueryService/test/test_momqueryservice.py
index d9a918f8db6..77a4ec251ec 100755
--- a/SAS/MoM/MoMQueryService/test/test_momqueryservice.py
+++ b/SAS/MoM/MoMQueryService/test/test_momqueryservice.py
@@ -73,7 +73,7 @@ try:
with self.assertRaises(ValueError) as error:
result = momrpc.getProjectDetails(inj_testid)
- unittest.main(verbosity=2)
+ unittest.main()
finally:
# cleanup test bus and exit
diff --git a/SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.py b/SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.py
index ccffef18377..b6d589d8c58 100644
--- a/SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.py
+++ b/SAS/ResourceAssignment/RATaskSpecifiedService/test/tRATaskSpecified.py
@@ -183,7 +183,7 @@ class TestService(unittest.TestCase):
self.assertEqual(self.requested_parsets, 3)
def main(argv):
- unittest.main(verbosity=2)
+ unittest.main()
if __name__ == "__main__":
# run all tests
diff --git a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/test/t_rotspservice.py b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/test/t_rotspservice.py
index 19e4f19a2cd..66bfa974c64 100755
--- a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/test/t_rotspservice.py
+++ b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/test/t_rotspservice.py
@@ -69,4 +69,4 @@ with patch('lofar.sas.resourceassignment.ratootdbtaskspecificationpropagator.rpc
##TODO: added test asserts etc
- #unittest.main(verbosity=2)
+ #unittest.main()
diff --git a/SAS/ResourceAssignment/ResourceAssigner/test/t_resourceassigner.py b/SAS/ResourceAssignment/ResourceAssigner/test/t_resourceassigner.py
index 76848599e54..90a9cb2828a 100755
--- a/SAS/ResourceAssignment/ResourceAssigner/test/t_resourceassigner.py
+++ b/SAS/ResourceAssignment/ResourceAssigner/test/t_resourceassigner.py
@@ -85,4 +85,4 @@ with patch('lofar.sas.resourceassignment.resourceassignmentservice.rpc.RARPC', a
#TODO: added test asserts etc
- unittest.main(verbosity=2)
+ unittest.main()
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/test/test_webservice.py b/SAS/ResourceAssignment/ResourceAssignmentEditor/test/test_webservice.py
index 17568953a73..9209f02fe51 100755
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/test/test_webservice.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/test/test_webservice.py
@@ -114,7 +114,7 @@ class TestLiveResourceAssignmentEditor(FlaskLiveTestCase):
def main(argv):
- unittest.main(verbosity=2)
+ unittest.main()
# run all tests if main
if __name__ == '__main__':
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEstimator/test/t_resource_estimator.py b/SAS/ResourceAssignment/ResourceAssignmentEstimator/test/t_resource_estimator.py
index 0ffcb51efee..27a1ad8871f 100755
--- a/SAS/ResourceAssignment/ResourceAssignmentEstimator/test/t_resource_estimator.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentEstimator/test/t_resource_estimator.py
@@ -96,7 +96,7 @@ try:
# create and run the service
with createService(busname=busname):
# and run all tests
- unittest.main(verbosity=2)
+ unittest.main()
finally:
# cleanup test bus and exit
diff --git a/SAS/ResourceAssignment/ResourceAssignmentService/test/test_ra_service_and_rpc.py b/SAS/ResourceAssignment/ResourceAssignmentService/test/test_ra_service_and_rpc.py
index 6557d8d76ff..a5d727a0a96 100755
--- a/SAS/ResourceAssignment/ResourceAssignmentService/test/test_ra_service_and_rpc.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentService/test/test_ra_service_and_rpc.py
@@ -94,7 +94,7 @@ try:
with createService(busname=busname):
# and run all tests
- unittest.main(verbosity=2)
+ unittest.main()
except ConnectError as ce:
logger.error(ce)
diff --git a/SAS/ResourceAssignment/Services/test/tRATaskSpecified.py b/SAS/ResourceAssignment/Services/test/tRATaskSpecified.py
index 457028e2565..f3b29ef117d 100644
--- a/SAS/ResourceAssignment/Services/test/tRATaskSpecified.py
+++ b/SAS/ResourceAssignment/Services/test/tRATaskSpecified.py
@@ -180,7 +180,7 @@ class TestService(unittest.TestCase):
self.assertEqual(self.requested_parsets, 3)
def main(argv):
- unittest.main(verbosity=2)
+ unittest.main()
if __name__ == "__main__":
# run all tests
diff --git a/SAS/ResourceAssignment/SystemStatusService/test/test_datamonitorqueueservice_and_rpc.py b/SAS/ResourceAssignment/SystemStatusService/test/test_datamonitorqueueservice_and_rpc.py
index 5adf460bdc0..c2c81b0dd59 100755
--- a/SAS/ResourceAssignment/SystemStatusService/test/test_datamonitorqueueservice_and_rpc.py
+++ b/SAS/ResourceAssignment/SystemStatusService/test/test_datamonitorqueueservice_and_rpc.py
@@ -91,7 +91,7 @@ try:
# create and run the service
with createService(busname=busname, servicename=servicename):
# and run all tests
- unittest.main(verbosity=2)
+ unittest.main()
print "done testing"
finally:
--
GitLab