diff --git a/integration-tests/source/systemtest/testcase.py b/integration-tests/source/systemtest/testcase.py index 1e4d64312d73b967148832b450b0c714500c5424..30e5e21b2e4bea33929479359a42538004d5b423 100644 --- a/integration-tests/source/systemtest/testcase.py +++ b/integration-tests/source/systemtest/testcase.py @@ -140,7 +140,7 @@ class TestCase(object): Prints specified error message and mark test case as failed. """ self.numberOfFailures += 1 - util.printAndFlush("ERROR: %s" % errorMessage) + util.printAndFlush("ERROR causing test failure: %s" % errorMessage) def installScriptBasedServer(self, templateName, instanceName, startCommand = ['./start.sh'], stopCommand = ['./stop.sh']): diff --git a/integration-tests/test_screening.py b/integration-tests/test_screening.py index 23c45b269abb8cdeb96750fd2b129da3b561a031..e68125f4f5702b640bf30b970814892639f49085 100755 --- a/integration-tests/test_screening.py +++ b/integration-tests/test_screening.py @@ -42,7 +42,7 @@ class TestCase(systemtest.testcase.TestCase): + "\[20100624113759640-7\]\) has \[\[DAPI, GFP\]\] channels, 9 tiles\. " + "Image resolution: 720x468") openbisController.dropAndWait('PLATE1', 'incoming-hcs', numberOfDataSets = 3) - openbisController.assertNumberOfDataSets(7, openbisController.getDataSets()) + openbisController.assertNumberOfDataSets(6, openbisController.getDataSets()) self.assertSpotSizes(openbisController, [['24', '16']]*3) def executeInDevMode(self): diff --git a/integration-tests/test_yeastx.py b/integration-tests/test_yeastx.py index 4570768e7d58e22d91da8b8d61713ec9694248bf..c24549362bd68635b13593d3b06224f069f1d513 100755 --- a/integration-tests/test_yeastx.py +++ b/integration-tests/test_yeastx.py @@ -34,8 +34,8 @@ class TestCase(systemtest.testcase.TestCase): self.dropDataSucessfully(openbisController, 'sample-code-with-experiment', 1, 14) self.dropDataSucessfully(openbisController, 'upload-mzxml-to-db', 1, 15) self.dropDataSucessfully(openbisController, 'TEST&TEST_PROJECT&EXP_TEST.20090925182754736-36.eicML', 1, 17, 'incoming-eicml') - self.dropDataSucessfully(openbisController, 'TEST&TEST_PROJECT&EXP_TEST.20090925182754736-36.fiaML', 1, 18, 'incoming-fiaml') - self.dropDataSucessfully(openbisController, 'TEST&TEST_PROJECT&EXP_TEST.anyText123', 1, 19, 'incoming-quantml') + self.dropDataSucessfully(openbisController, 'TEST&TEST_PROJECT&EXP_TEST.20090925182754736-36.fiaML', 1, 17, 'incoming-fiaml') + self.dropDataSucessfully(openbisController, 'TEST&TEST_PROJECT&EXP_TEST.anyText123', 1, 18, 'incoming-quantml') self.assertNumberOfFiles(openbisController, 'eicml', 6) self.assertNumberOfFiles(openbisController, 'fiaml', 2) self.assertNumberOfRowsInMetabolDev(openbisController, 'eic_ms_runs', 2)