Skip to content

Commit 15e51c3

Browse files
committed
Auto merge pulled in some old auto generated test. Re generated tests from most current code using make checks
1 parent 6a1e80b commit 15e51c3

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

nipype/interfaces/brainsuite/tests/test_auto_BDP.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ def test_BDP_inputs():
77
input_map = dict(BVecBValPair=dict(argstr='--bvec %s --bval %s',
88
mandatory=True,
99
position=-1,
10-
xor=['bMatrixFile'],
10+
xor=[u'bMatrixFile'],
1111
),
1212
args=dict(argstr='%s',
1313
),
1414
bMatrixFile=dict(argstr='--bmat %s',
1515
mandatory=True,
1616
position=-1,
17-
xor=['BVecBValPair'],
17+
xor=[u'BVecBValPair'],
1818
),
1919
bValRatioThreshold=dict(argstr='--bval-ratio-threshold %f',
2020
),
2121
bfcFile=dict(argstr='%s',
2222
mandatory=True,
2323
position=0,
24-
xor=['noStructuralRegistration'],
24+
xor=[u'noStructuralRegistration'],
2525
),
2626
customDiffusionLabel=dict(argstr='--custom-diffusion-label %s',
2727
),
@@ -51,10 +51,10 @@ def test_BDP_inputs():
5151
estimateTensors=dict(argstr='--tensors',
5252
),
5353
fieldmapCorrection=dict(argstr='--fieldmap-correction %s',
54-
requires=['echoSpacing'],
54+
requires=[u'echoSpacing'],
5555
),
5656
fieldmapCorrectionMethod=dict(argstr='--fieldmap-correction-method %s',
57-
xor=['skipIntensityCorr'],
57+
xor=[u'skipIntensityCorr'],
5858
),
5959
fieldmapSmooth=dict(argstr='--fieldmap-smooth3=%f',
6060
),
@@ -80,7 +80,7 @@ def test_BDP_inputs():
8080
noStructuralRegistration=dict(argstr='--no-structural-registration',
8181
mandatory=True,
8282
position=0,
83-
xor=['bfcFile'],
83+
xor=[u'bfcFile'],
8484
),
8585
odfLambta=dict(argstr='--odf-lambda <L>',
8686
),
@@ -99,7 +99,7 @@ def test_BDP_inputs():
9999
skipDistortionCorr=dict(argstr='--no-distortion-correction',
100100
),
101101
skipIntensityCorr=dict(argstr='--no-intensity-correction',
102-
xor=['fieldmapCorrectionMethod'],
102+
xor=[u'fieldmapCorrectionMethod'],
103103
),
104104
skipNonuniformityCorr=dict(argstr='--no-nonuniformity-correction',
105105
),

nipype/interfaces/brainsuite/tests/test_auto_SVReg.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ def test_SVReg_inputs():
5454
useSingleThreading=dict(argstr="'-U'",
5555
),
5656
verbosity0=dict(argstr="'-v0'",
57-
xor=('verbosity0', 'verbosity1', 'verbosity2'),
57+
xor=(u'verbosity0', u'verbosity1', u'verbosity2'),
5858
),
5959
verbosity1=dict(argstr="'-v1'",
60-
xor=('verbosity0', 'verbosity1', 'verbosity2'),
60+
xor=(u'verbosity0', u'verbosity1', u'verbosity2'),
6161
),
6262
verbosity2=dict(argstr="'v2'",
63-
xor=('verbosity0', 'verbosity1', 'verbosity2'),
63+
xor=(u'verbosity0', u'verbosity1', u'verbosity2'),
6464
),
6565
)
6666
inputs = SVReg.input_spec()

0 commit comments

Comments
 (0)