Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
f995b64b
Commit
f995b64b
authored
9 years ago
by
Federico Montesino Pouzols
Browse files
Options
Downloads
Patches
Plain Diff
use jobmanagertype attr name in parser and tests, re #11460
parent
146e9e99
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Code/Mantid/Framework/Kernel/src/ComputeResourceInfo.cpp
+1
-1
1 addition, 1 deletion
Code/Mantid/Framework/Kernel/src/ComputeResourceInfo.cpp
Code/Mantid/Framework/Kernel/test/ComputeResourceInfoTest.h
+2
-2
2 additions, 2 deletions
Code/Mantid/Framework/Kernel/test/ComputeResourceInfoTest.h
with
3 additions
and
3 deletions
Code/Mantid/Framework/Kernel/src/ComputeResourceInfo.cpp
+
1
−
1
View file @
f995b64b
...
@@ -40,7 +40,7 @@ ComputeResourceInfo::ComputeResourceInfo(const FacilityInfo *fac,
...
@@ -40,7 +40,7 @@ ComputeResourceInfo::ComputeResourceInfo(const FacilityInfo *fac,
// default: Mantid web service API:
// default: Mantid web service API:
// http://www.mantidproject.org/Remote_Job_Submission_API
// http://www.mantidproject.org/Remote_Job_Submission_API
m_managerType
=
"MantidWebServiceAPIJobManager"
;
m_managerType
=
"MantidWebServiceAPIJobManager"
;
std
::
string
type
=
elem
->
getAttribute
(
"
J
ob
M
anager
T
ype"
);
std
::
string
type
=
elem
->
getAttribute
(
"
j
ob
m
anager
t
ype"
);
if
(
!
type
.
empty
())
{
if
(
!
type
.
empty
())
{
m_managerType
=
type
;
m_managerType
=
type
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Code/Mantid/Framework/Kernel/test/ComputeResourceInfoTest.h
+
2
−
2
View file @
f995b64b
...
@@ -105,7 +105,7 @@ public:
...
@@ -105,7 +105,7 @@ public:
void
test_normalSCARF
()
{
void
test_normalSCARF
()
{
const
std
::
string
scarf
=
"<computeResource name=
\"
"
+
scarfName
+
const
std
::
string
scarf
=
"<computeResource name=
\"
"
+
scarfName
+
"
\"
J
ob
M
anager
T
ype=
\"
"
+
scarfType
+
"
\"
>"
"
\"
j
ob
m
anager
t
ype=
\"
"
+
scarfType
+
"
\"
>"
"<baseURL>"
+
"<baseURL>"
+
scarfURL
+
"</baseURL>"
scarfURL
+
"</baseURL>"
"</computeResource>"
;
"</computeResource>"
;
...
@@ -139,7 +139,7 @@ public:
...
@@ -139,7 +139,7 @@ public:
void
test_brokenSCARF
()
{
void
test_brokenSCARF
()
{
const
std
::
string
type
=
"SCARFLSFJobManager"
;
const
std
::
string
type
=
"SCARFLSFJobManager"
;
const
std
::
string
err
=
"<computeResource foo=
\"
"
+
scarfName
+
const
std
::
string
err
=
"<computeResource foo=
\"
"
+
scarfName
+
"
\"
J
ob
M
anager
T
ype=
\"
"
+
type
+
"
\"
>"
"
\"
j
ob
m
anager
t
ype=
\"
"
+
type
+
"
\"
>"
"<URL>"
+
"<URL>"
+
scarfURL
+
"</URL>"
scarfURL
+
"</URL>"
"</computeResource>"
;
"</computeResource>"
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment