From f995b64b6b3819d443e7a24ffcd3093e40a1a936 Mon Sep 17 00:00:00 2001 From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk> Date: Wed, 1 Apr 2015 10:58:37 +0100 Subject: [PATCH] use jobmanagertype attr name in parser and tests, re #11460 --- Code/Mantid/Framework/Kernel/src/ComputeResourceInfo.cpp | 2 +- Code/Mantid/Framework/Kernel/test/ComputeResourceInfoTest.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Code/Mantid/Framework/Kernel/src/ComputeResourceInfo.cpp b/Code/Mantid/Framework/Kernel/src/ComputeResourceInfo.cpp index 6669c1f2283..df25d17cbd3 100644 --- a/Code/Mantid/Framework/Kernel/src/ComputeResourceInfo.cpp +++ b/Code/Mantid/Framework/Kernel/src/ComputeResourceInfo.cpp @@ -40,7 +40,7 @@ ComputeResourceInfo::ComputeResourceInfo(const FacilityInfo *fac, // default: Mantid web service API: // http://www.mantidproject.org/Remote_Job_Submission_API m_managerType = "MantidWebServiceAPIJobManager"; - std::string type = elem->getAttribute("JobManagerType"); + std::string type = elem->getAttribute("jobmanagertype"); if (!type.empty()) { m_managerType = type; } diff --git a/Code/Mantid/Framework/Kernel/test/ComputeResourceInfoTest.h b/Code/Mantid/Framework/Kernel/test/ComputeResourceInfoTest.h index 213a98ed209..b1b561bbc78 100644 --- a/Code/Mantid/Framework/Kernel/test/ComputeResourceInfoTest.h +++ b/Code/Mantid/Framework/Kernel/test/ComputeResourceInfoTest.h @@ -105,7 +105,7 @@ public: void test_normalSCARF() { const std::string scarf = "<computeResource name=\"" + scarfName + - "\" JobManagerType=\"" + scarfType + "\">" + "\" jobmanagertype=\"" + scarfType + "\">" "<baseURL>" + scarfURL + "</baseURL>" "</computeResource>"; @@ -139,7 +139,7 @@ public: void test_brokenSCARF() { const std::string type = "SCARFLSFJobManager"; const std::string err = "<computeResource foo=\"" + scarfName + - "\" JobManagerType=\"" + type + "\">" + "\" jobmanagertype=\"" + type + "\">" "<URL>" + scarfURL + "</URL>" "</computeResource>"; -- GitLab