From d27471cfb57b7c6f5e043e824f176d90e907092e Mon Sep 17 00:00:00 2001 From: Zdenek Maxa Date: Tue, 23 Apr 2013 21:13:59 +0200 Subject: [PATCH] Removed GroupUser couchapp from ReqMgr unittests ReqMgr unittests pushing GroupUser couchapp was not necessary, removed. The couchapp is not used in ReqMgr at all. --- test/python/WMCore_t/RequestManager_t/Admin_t.py | 10 ++-------- test/python/WMCore_t/RequestManager_t/Assign_t.py | 11 ++--------- .../WMCore_t/RequestManager_t/ReqMgrPriority_t.py | 10 +++------- .../WMCore_t/RequestManager_t/ReqMgrWebTools_t.py | 4 ---- .../WMCore_t/RequestManager_t/ReqMgrWorkload_t.py | 12 +++++------- test/python/WMCore_t/RequestManager_t/ReqMgr_t.py | 5 +---- 6 files changed, 13 insertions(+), 39 deletions(-) diff --git a/test/python/WMCore_t/RequestManager_t/Admin_t.py b/test/python/WMCore_t/RequestManager_t/Admin_t.py index 424b43a9fb..ac9b95900c 100644 --- a/test/python/WMCore_t/RequestManager_t/Admin_t.py +++ b/test/python/WMCore_t/RequestManager_t/Admin_t.py @@ -1,9 +1,6 @@ -#!/usr/bin/env python - """ -Admin_t - Test for code in the RequestDB/Admin section + """ import os import unittest @@ -20,8 +17,6 @@ class AdminTest(RESTBaseUnitTest): """ - _AdminTest_ - Test for the lower-level DB code in the admin section """ @@ -33,8 +28,7 @@ def setUp(self): """ self.couchDBName = "reqmgr_t_0" RESTBaseUnitTest.setUp(self) - self.testInit.setupCouch("%s" % self.couchDBName, - "GroupUser", "ConfigCache", "ReqMgr") + self.testInit.setupCouch("%s" % self.couchDBName, "ConfigCache", "ReqMgr") reqMgrHost = self.config.getServerUrl() self.jsonSender = JSONRequests(reqMgrHost) diff --git a/test/python/WMCore_t/RequestManager_t/Assign_t.py b/test/python/WMCore_t/RequestManager_t/Assign_t.py index 1c213e758e..7a77bada48 100644 --- a/test/python/WMCore_t/RequestManager_t/Assign_t.py +++ b/test/python/WMCore_t/RequestManager_t/Assign_t.py @@ -1,6 +1,5 @@ -#!/usr/bin/env python - """ + RequestManager unittest Tests the functions of the REST API @@ -28,11 +27,6 @@ class AssignTest(RESTBaseUnitTest): - """ - _AssignTest_ - - """ - def setUp(self): """ setUP global values @@ -41,8 +35,7 @@ def setUp(self): """ self.couchDBName = "reqmgr_t_0" RESTBaseUnitTest.setUp(self, initRoot = False) - self.testInit.setupCouch("%s" % self.couchDBName, - "GroupUser", "ConfigCache", "ReqMgr") + self.testInit.setupCouch("%s" % self.couchDBName, "ConfigCache", "ReqMgr") reqMgrHost = self.config.getServerUrl() self.jsonSender = JSONRequests(reqMgrHost) diff --git a/test/python/WMCore_t/RequestManager_t/ReqMgrPriority_t.py b/test/python/WMCore_t/RequestManager_t/ReqMgrPriority_t.py index 259b644a5a..868064ea3a 100644 --- a/test/python/WMCore_t/RequestManager_t/ReqMgrPriority_t.py +++ b/test/python/WMCore_t/RequestManager_t/ReqMgrPriority_t.py @@ -24,8 +24,6 @@ class ReqMgrPriorityTest(RESTBaseUnitTest): """ - _ReqMgrPriorityTest_ - Basic test for setting the priority in ReqMgr Services """ @@ -37,11 +35,9 @@ def setUp(self): """ self.couchDBName = "reqmgr_t_0" RESTBaseUnitTest.setUp(self) - self.testInit.setupCouch("%s" % self.couchDBName, - "GroupUser", "ConfigCache", "ReqMgr") - self.testInit.setupCouch("%s_wmstats" % self.couchDBName, - "WMStats") - reqMgrHost = self.config.getServerUrl() + self.testInit.setupCouch("%s" % self.couchDBName, "ConfigCache", "ReqMgr") + self.testInit.setupCouch("%s_wmstats" % self.couchDBName, "WMStats") + reqMgrHost = self.config.getServerUrl() self.jsonSender = JSONRequests(reqMgrHost) diff --git a/test/python/WMCore_t/RequestManager_t/ReqMgrWebTools_t.py b/test/python/WMCore_t/RequestManager_t/ReqMgrWebTools_t.py index ae77135e89..a740c93a5a 100644 --- a/test/python/WMCore_t/RequestManager_t/ReqMgrWebTools_t.py +++ b/test/python/WMCore_t/RequestManager_t/ReqMgrWebTools_t.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python - """ Unittest for ReqMgr utilities @@ -11,8 +9,6 @@ class ReqMgrWebToolsTest(unittest.TestCase): """ - _ReqMgrWebTools_ - Test class for the ReqMgr utility functions This ONLY tests things that don't touch the DB diff --git a/test/python/WMCore_t/RequestManager_t/ReqMgrWorkload_t.py b/test/python/WMCore_t/RequestManager_t/ReqMgrWorkload_t.py index c7b25cd58c..fba665315a 100644 --- a/test/python/WMCore_t/RequestManager_t/ReqMgrWorkload_t.py +++ b/test/python/WMCore_t/RequestManager_t/ReqMgrWorkload_t.py @@ -28,8 +28,6 @@ class ReqMgrWorkloadTest(RESTBaseUnitTest): """ - _ReqMgrWorkloadTest_ - Test that sets up and checks the validations of the various main WMSpec.StdSpecs This is mostly a simple set of tests which can be very repetitive. @@ -39,13 +37,12 @@ def setUp(self): """ setUP global values Database setUp is done in base class + """ self.couchDBName = "reqmgr_t_0" RESTBaseUnitTest.setUp(self) - self.testInit.setupCouch("%s" % self.couchDBName, - "GroupUser", "ConfigCache", "ReqMgr") - self.testInit.setupCouch("%s_wmstats" % self.couchDBName, - "WMStats") + self.testInit.setupCouch("%s" % self.couchDBName, "ConfigCache", "ReqMgr") + self.testInit.setupCouch("%s_wmstats" % self.couchDBName, "WMStats") reqMgrHost = self.config.getServerUrl() self.jsonSender = JSONRequests(reqMgrHost) @@ -788,5 +785,6 @@ def testK_LHEStepZero(self): self.assertEqual(request['RequestNumEvents'], 100) self.assertEqual(request['RequestSizeFiles'], 0) + if __name__=='__main__': - unittest.main() + unittest.main() \ No newline at end of file diff --git a/test/python/WMCore_t/RequestManager_t/ReqMgr_t.py b/test/python/WMCore_t/RequestManager_t/ReqMgr_t.py index a82b8fec63..20a3873dc0 100644 --- a/test/python/WMCore_t/RequestManager_t/ReqMgr_t.py +++ b/test/python/WMCore_t/RequestManager_t/ReqMgr_t.py @@ -71,8 +71,6 @@ def _setupAssign(self): class ReqMgrTest(RESTBaseUnitTest): """ - _ReqMgrTest_ - Basic test for the ReqMgr services. Setup is done off-screen in RESTBaseUnitTest - this makes things confusing @@ -86,8 +84,7 @@ def setUp(self): """ self.couchDBName = "reqmgr_t_0" RESTBaseUnitTest.setUp(self) - self.testInit.setupCouch("%s" % self.couchDBName, - "GroupUser", "ConfigCache", "ReqMgr") + self.testInit.setupCouch("%s" % self.couchDBName, "ConfigCache", "ReqMgr") self.testInit.setupCouch("%s_wmstats" % self.couchDBName, "WMStats") reqMgrHost = self.config.getServerUrl()