diff PerfsDb/Run.py @ 161:27b3b0df5f90

2 upload tests
author am@osimis.io
date Fri, 17 Aug 2018 17:24:11 +0200
parents 6995d5d12d88
children dbc42a03ee75
line wrap: on
line diff
--- a/PerfsDb/Run.py	Fri Aug 17 16:17:57 2018 +0200
+++ b/PerfsDb/Run.py	Fri Aug 17 17:24:11 2018 +0200
@@ -33,6 +33,14 @@
     TestConfig(label= "mssql-medium", dbSize=DbSize.Medium, dbServer=DbServer(dbType=DbType.MSSQL, port=4004)),
     TestConfig(label= "sqlite-medium", dbSize=DbSize.Medium, dbType=DbType.Sqlite),
     TestConfig(label= "sqliteplugin-medium", dbSize=DbSize.Medium, dbType=DbType.SqlitePlugin),
+
+    TestConfig(label= "mysql-large", dbSize=DbSize.Large, dbServer=DbServer(dbType=DbType.MySQL, port=5000)),
+    TestConfig(label= "pg9-large", dbSize=DbSize.Large, dbServer=DbServer(dbType=DbType.PG9, port=5001)),
+    TestConfig(label= "pg10-large", dbSize=DbSize.Large, dbServer=DbServer(dbType=DbType.PG10, port=5002)),
+    TestConfig(label= "pg11-large", dbSize=DbSize.Large, dbServer=DbServer(dbType=DbType.PG11, port=5003)),
+    TestConfig(label= "mssql-large", dbSize=DbSize.Large, dbServer=DbServer(dbType=DbType.MSSQL, port=5004)),
+    TestConfig(label= "sqlite-large", dbSize=DbSize.Large, dbType=DbType.Sqlite),
+    TestConfig(label= "sqliteplugin-large", dbSize=DbSize.Large, dbType=DbType.SqlitePlugin),
 ]
 
 allTests = [
@@ -42,7 +50,8 @@
     TestFindStudyByStudyDescription0Results(),
     TestFindStudyByPatientId0Results(),
     TestFindStudyByPatientId5Results(),
-    TestUploadFile(),
+    TestUploadNextPatientFile(),
+    TestUploadFirstPatientFile(),
 ]
 
 selectedTestConfigs = []
@@ -62,6 +71,8 @@
 parser.add_argument("--plugins-path", help = "path to the folder containing Orthanc executable", default=".")
 parser.add_argument("--repeat", help = "number of times to repeat each test to average timings", type=int, default=50)
 parser.add_argument("--test-filter", help = "filter tests by names (wildcards are allowed)", default="*")
+parser.add_argument("--verbose", help = "start Orthanc in verbose mode", action = "store_true")
+parser.add_argument("--trace", help = "start Orthanc in trace mode", action = "store_true")
 
 args = parser.parse_args()
 
@@ -110,7 +121,7 @@
         testConfig.launchDbServer()
         
         print("** Launching Orthanc")
-        orthancWasAlreadyRunning = not testConfig.launchOrthanc(args.orthanc_path)
+        orthancWasAlreadyRunning = not testConfig.launchOrthanc(args.orthanc_path, verboseEnabled=args.verbose, traceEnabled=args.trace)
         if orthancWasAlreadyRunning and len(selectedTestConfigs) > 1:
             print("Error: Can't execute multiple configuration on already running Orthanc.  Exit Orthanc and let this script start Orthanc instances")
             exit(-1)