Commit 10c3aa32 authored by Andrea Valassi's avatar Andrea Valassi
Browse files

Complte the move to testing the 2.9.0 schema instead of the 2.8.0 schema


git-svn-id: file:///git/lcgcool.svndb/cool/trunk@20087 4525493e-7705-40b1-a816-d608a930855b
parent 841092dd
......@@ -19,7 +19,6 @@ import CoolDescribeTable
import CoolQueryManager
###print 'DEBUG: Import coral'
###global coral
from PyCool import coral
##############################################################################
......@@ -227,8 +226,8 @@ class ReferenceDbMgr:
#-------------------------------------------------------------------------
def dropReferenceDb(self,connectString):
#print 'DEBUG: Drop reference database'
#print 'DEBUG: -> db ID:', connectString
print 'DEBUG: Drop reference database'
###print 'DEBUG: -> db ID:', connectString
self.dbSvc.dropDatabase( connectString )
#-------------------------------------------------------------------------
......@@ -838,7 +837,7 @@ class TestReferenceDb1RO( unittest.TestCase ):
#print 'DEBUG: *START* TestReferenceDb1RO CLASS INITIALIZATION'
iTest=0
nTest=0
refSchemaVersion="2.8.0"
refSchemaVersion="2.9.0"
connectString=""
mgr=0
db=0
......@@ -977,7 +976,10 @@ class TestReferenceDb1RO( unittest.TestCase ):
'(R/O test)'
elif ( dbSchemaVersion == "2.0.0" ):
TestReferenceDb1RO.dbSchemaVersion200 = True
if self.mgr.refSchemaVersion280 :
if self.mgr.refSchemaVersion290 :
print 'DEBUG: Test 2.9.0 reference schema on a 2.0.0 db',\
'(R/O test)'
elif self.mgr.refSchemaVersion280 :
print 'DEBUG: Test 2.8.0 reference schema on a 2.0.0 db',\
'(R/O test)'
elif self.mgr.refSchemaVersion220 :
......@@ -1025,7 +1027,7 @@ class TestReferenceDb1RO( unittest.TestCase ):
foldersets=fsroot.listFolderSets()
###self.mgr.app.setOutputLevel( outLvl )
self.assertEquals( folders.size(), 0 )
if self.mgr.refSchemaVersion290 : # NEW 2.8.0 SCHEMA ONLY
if self.mgr.refSchemaVersion290 : # NEW 2.9.0 SCHEMA ONLY
self.assertEquals( foldersets.size(), 6 )
elif self.mgr.refSchemaVersion280 : # NEW 2.8.0 SCHEMA ONLY
self.assertEquals( foldersets.size(), 5 )
......@@ -2469,7 +2471,7 @@ class TestReferenceDb1RW( unittest.TestCase ):
#print 'DEBUG: *START* TestReferenceDb1RW CLASS INITIALIZATION'
iTest=0
nTest=0
refSchemaVersion="2.8.0"
refSchemaVersion="2.9.0"
connectString=""
mgr=0
db=0
......@@ -2489,7 +2491,10 @@ class TestReferenceDb1RW( unittest.TestCase ):
#print 'DEBUG: Total # RW instances=', self.nTest
if TestReferenceDb1RW.iTest == 1 :
if TestReferenceDb1RW.refSchemaVersion == "2.8.0" :
if TestReferenceDb1RW.refSchemaVersion == "2.9.0" :
print 'DEBUG: Create TestReferenceDb1RW',\
'for 2.9.0 reference schema'
elif TestReferenceDb1RW.refSchemaVersion == "2.8.0" :
print 'DEBUG: Create TestReferenceDb1RW',\
'for 2.8.0 reference schema'
elif TestReferenceDb1RW.refSchemaVersion == "2.2.0" :
......@@ -2573,7 +2578,11 @@ class TestReferenceDb1RW( unittest.TestCase ):
print 'DEBUG: -> db schema version:', dbSchemaVersion
if ( dbSchemaVersion == "1.3.0" ):
TestReferenceDb1RW.dbSchemaVersion200 = False
if self.mgr.refSchemaVersion280 :
if self.mgr.refSchemaVersion290 :
print 'ERROR: TestReferenceDb1RW (2.9.0)',\
'cannot be executed on a 1.3.0 db'
sys.exit(-1)
elif self.mgr.refSchemaVersion280 :
print 'ERROR: TestReferenceDb1RW (2.8.0)',\
'cannot be executed on a 1.3.0 db'
sys.exit(-1)
......@@ -2590,7 +2599,10 @@ class TestReferenceDb1RW( unittest.TestCase ):
'(R/W test)'
elif ( dbSchemaVersion == "2.0.0" ):
TestReferenceDb1RW.dbSchemaVersion200 = True
if self.mgr.refSchemaVersion280 :
if self.mgr.refSchemaVersion290 :
print 'DEBUG: Test 2.9.0 reference schema on a 2.0.0 db',\
'(R/W test)'
elif self.mgr.refSchemaVersion280 :
print 'DEBUG: Test 2.8.0 reference schema on a 2.0.0 db',\
'(R/W test)'
elif self.mgr.refSchemaVersion220 :
......@@ -3186,7 +3198,7 @@ class TestReferenceDb2RO( unittest.TestCase ):
#print 'DEBUG: *START* TestReferenceDb2RO CLASS INITIALIZATION'
iTest=0
nTest=0
refSchemaVersion="2.8.0"
refSchemaVersion="2.9.0"
connectString=""
mgr=0
db=0
......@@ -3206,7 +3218,10 @@ class TestReferenceDb2RO( unittest.TestCase ):
#print 'DEBUG: Total # RO instances=', self.nTest
if TestReferenceDb2RO.iTest == 1 :
if TestReferenceDb2RO.refSchemaVersion == "2.8.0" :
if TestReferenceDb2RO.refSchemaVersion == "2.9.0" :
print 'DEBUG: Create TestReferenceDb2RO',\
'for 2.9.0 reference schema'
elif TestReferenceDb2RO.refSchemaVersion == "2.8.0" :
print 'DEBUG: Create TestReferenceDb2RO',\
'for 2.8.0 reference schema'
elif TestReferenceDb2RO.refSchemaVersion == "2.2.0" :
......@@ -3301,7 +3316,11 @@ class TestReferenceDb2RO( unittest.TestCase ):
print 'DEBUG: -> db schema version:', dbSchemaVersion
if ( dbSchemaVersion == "1.3.0" ):
TestReferenceDb2RO.dbSchemaVersion200 = False
if self.mgr.refSchemaVersion280 :
if self.mgr.refSchemaVersion290 :
print 'ERROR: TestReferenceDb2RO (2.9.0)',\
'cannot be executed on a 1.3.0 db'
sys.exit(-1)
elif self.mgr.refSchemaVersion280 :
print 'ERROR: TestReferenceDb2RO (2.8.0)',\
'cannot be executed on a 1.3.0 db'
sys.exit(-1)
......@@ -3318,7 +3337,10 @@ class TestReferenceDb2RO( unittest.TestCase ):
'(R/O test)'
elif ( dbSchemaVersion == "2.0.0" ):
TestReferenceDb2RO.dbSchemaVersion200 = True
if self.mgr.refSchemaVersion280 :
if self.mgr.refSchemaVersion290 :
print 'DEBUG: Test 2.9.0 reference schema on a 2.0.0 db',\
'(R/O test)'
elif self.mgr.refSchemaVersion280 :
print 'DEBUG: Test 2.8.0 reference schema on a 2.0.0 db',\
'(R/O test)'
elif self.mgr.refSchemaVersion220 :
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment