fix more input files

fixes idaholab#9571

modules/combined/tests/elastic_thermal_patch/elastic_thermal_jacobian_rz_smp.i

@@ -44,13 +44,20 @@
   [../]
 []
 
-[Modules/TensorMechanics/Master/All]
-  displacements = 'disp_x disp_y'
-  add_variables = true
-  strain = SMALL
-  incremental = true
-  eigenstrain_names = eigenstrain
-  generate_output = 'stress_xx stress_yy stress_zz stress_xy stress_yz stress_zx'
+[Modules]
+    [TensorMechanics]
+        [Master]
+            displacements = 'disp_x disp_y'
+            [All]
+                displacements = 'disp_x disp_y'
+                add_variables = true
+                strain = SMALL
+                incremental = true
+                eigenstrain_names = eigenstrain
+                generate_output = 'stress_xx stress_yy stress_zz stress_xy stress_yz stress_zx'
+            [../]
+        [../]
+    [../]
 []
 
 [Kernels]

modules/combined/tests/elastic_thermal_patch/elastic_thermal_patch_rz_smp.i

@@ -82,13 +82,20 @@
   [../]
 []
 
-[Modules/TensorMechanics/Master/All]
-  displacements = 'disp_x disp_y'
-  add_variables = true
-  strain = SMALL
-  incremental = true
-  eigenstrain_names = eigenstrain
-  generate_output = 'stress_xx stress_yy stress_zz stress_xy stress_yz stress_zx'
+[Modules]
+    [TensorMechanics]
+        [Master]
+            displacements = 'disp_x disp_y'
+            [All]
+                displacements = 'disp_x disp_y'
+                add_variables = true
+                strain = SMALL
+                incremental = true
+                eigenstrain_names = eigenstrain
+                generate_output = 'stress_xx stress_yy stress_zz stress_xy stress_yz stress_zx'
+            [../]
+        [../]
+    [../]
 []
 
 [Kernels]

modules/combined/tests/fieldsplit_contact/2blocks3d.i

@@ -9,7 +9,7 @@
 []
 
 [Problem]
-  error_on_jacobian_nonzero_reallocation = true;
+  error_on_jacobian_nonzero_reallocation = true
 []
 
 [Modules/TensorMechanics/Master]

modules/combined/tests/fieldsplit_contact/2blocks3d_sm.i

@@ -146,7 +146,7 @@
 []
 
 [Problem]
-  error_on_jacobian_nonzero_reallocation = true;
+  error_on_jacobian_nonzero_reallocation = true
 []
 
 [Executioner]

modules/combined/tests/solid_mechanics/j_integral/tests

@@ -58,18 +58,18 @@
  [../]
  [./j_3d_as_2d_topo_q_outq]
    type = 'Exodiff'
-   input = 'j_integral_3d_as_2d_topo_q_func.i cli_args = "DomainIntegral/output_q=false" "Outputs/file_base=j_integral_3d_as_2d_topo_q_func_outputQ_out"'
+   input = 'j_integral_3d_as_2d_topo_q_func.i "DomainIntegral/output_q=false" "Outputs/file_base=j_integral_3d_as_2d_topo_q_func_outputQ_out"'
    exodiff = 'j_integral_3d_as_2d_topo_q_func_outputQ_out.e'
    rel_err = 5e-5
  [../]
  [./j_3d_mouth_dir_outq]
    type = 'Exodiff'
-   input = 'j_integral_3d_mouth_dir.i cli_args = "DomainIntegral/output_q=false" "Outputs/file_base=j_integral_3d_mouth_dir_outputQ_out"'
+   input = 'j_integral_3d_mouth_dir.i "DomainIntegral/output_q=false" "Outputs/file_base=j_integral_3d_mouth_dir_outputQ_out"'
    exodiff = 'j_integral_3d_mouth_dir_outputQ_out.e'
  [../]
  [./j_2d_outq]
    type = 'Exodiff'
-   input = 'j_integral_2d.i cli_args = "DomainIntegral/output_q=false" "Outputs/file_base=j_integral_2d_outputQ_out"'
+   input = 'j_integral_2d.i "DomainIntegral/output_q=false" "Outputs/file_base=j_integral_2d_outputQ_out"'
    exodiff = 'j_integral_2d_outputQ_out.e'
  [../]
 []

modules/tensor_mechanics/tests/2D_geometries/tests

@@ -12,7 +12,6 @@
     exodiff = 'planestrain_out.e'
     abs_zero = 5e-6
     compiler = 'CLANG GCC'
-    cli_args = 'GlobalParams/volumetric_locking_correction=true'
     prereq = 'plane_strain'
   [../]
   [./finite_planestrain]

modules/tensor_mechanics/tests/crystal_plasticity/crysp_cutback.i

@@ -142,7 +142,7 @@
     hprops = '1.0 541.5 60.8 109.8 2.5'
     gprops = '1 4 60.8 5 8 60.8 9 12 60.8'
     tan_mod_type = exact
-    gen_random_stress_flag = true;
+    gen_random_stress_flag = true
   [../]
   [./elasticity_tensor]
     type = ComputeElasticityTensorCP

modules/tensor_mechanics/tests/crystal_plasticity/crysp_substep.i

@@ -142,7 +142,7 @@
     hprops = '1.0 541.5 60.8 109.8 2.5'
     gprops = '1 4 60.8 5 8 60.8 9 12 60.8'
     tan_mod_type = exact
-    gen_random_stress_flag = false;
+    gen_random_stress_flag = false
     maximum_substep_iteration = 2
   [../]
   [./elasticity_tensor]

modules/tensor_mechanics/tests/finite_strain_jacobian/tests

@@ -8,7 +8,7 @@
     type = 'Exodiff'
     input = 'bending_jacobian.i'
     exodiff = 'bending_jacobian_out.e'
-    cli_args = 'GlobalParams/volumetric_locking_correction = true'
+    cli_args = 'GlobalParams/volumetric_locking_correction=true'
     prereq = 'bending'
   [../]
   [./3d_bar]
@@ -20,7 +20,7 @@
     type = 'Exodiff'
     input = '3d_bar.i'
     exodiff = '3d_bar_out.e'
-    cli_args = 'GlobalParams/volumetric_locking_correction = true'
+    cli_args = 'GlobalParams/volumetric_locking_correction=true'
     prereq = '3d_bar'
   [../]
 []

modules/tensor_mechanics/tests/isotropic_elasticity_tensor/tests

@@ -24,7 +24,7 @@
     type = Exodiff
     input = '2D-axisymmetric_rz_test.i'
     exodiff = '2D-axisymmetric_rz_test_out.e'
-    cli_args = 'GlobalParams/volumetric_locking_correction = true'
+    cli_args = 'GlobalParams/volumetric_locking_correction=true'
     prereq = 'axisymmetric_rz'
   [../]
 []

modules/tensor_mechanics/tests/pressure/tests

@@ -8,7 +8,7 @@
     type = Exodiff
     input = 'pressure_test.i'
     exodiff = 'pressure_test_out.e'
-    cli_args = 'GlobalParams/volumetric_locking_correction = true'
+    cli_args = 'GlobalParams/volumetric_locking_correction=true'
     prereq = '3D'
   [../]
 []

modules/tensor_mechanics/tests/tensile/tests

@@ -12,7 +12,6 @@
     csvdiff = 'small_deform1.csv'
     rel_err = 1.0E-5
     abs_zero = 1.0E-5
-    cli_args = 'GlobalParams/volumetric_locking_correction=true'
     prereq = 'small1'
   [../]
   [./small2]
@@ -28,7 +27,6 @@
     csvdiff = 'small_deform2.csv'
     rel_err = 1.0E-5
     abs_zero = 1.0E-5
-    cli_args = 'GlobalParams/volumetric_locking_correction=true'
     prereq = 'small2'
   [../]
   [./small3]
@@ -44,7 +42,6 @@
     csvdiff = 'small_deform3.csv'
     rel_err = 1.0E-5
     abs_zero = 1.0E-5
-    cli_args = 'GlobalParams/volumetric_locking_correction=true'
     prereq = 'small3'
   [../]
   [./small4]
@@ -60,7 +57,6 @@
     csvdiff = 'small_deform4.csv'
     rel_err = 1.0E-5
     abs_zero = 1.0E-5
-    cli_args = 'GlobalParams/volumetric_locking_correction=true'
     prereq = 'small4'
   [../]
   [./small5]
@@ -76,7 +72,6 @@
     csvdiff = 'small_deform5.csv'
     rel_err = 1.0E-5
     abs_zero = 1.0E-5
-    cli_args = 'GlobalParams/volumetric_locking_correction=true'
     prereq = 'small5'
   [../]
   [./small6]
@@ -143,7 +138,7 @@
     csvdiff = 'planar1.csv'
     rel_err = 1.0E-5
     abs_zero = 1.0E-5
-    cli_args = '--no-trap-fpe GlobalParams/volumetric_locking_correction=true'
+    cli_args = '--no-trap-fpe'
     prereq = 'planar1'
   [../]
   [./planar2]
@@ -160,7 +155,7 @@
     csvdiff = 'planar2.csv'
     rel_err = 1.0E-5
     abs_zero = 1.0E-5
-    cli_args = '--no-trap-fpe GlobalParams/volumetric_locking_correction=true'
+    cli_args = '--no-trap-fpe'
     prereq = 'planar2'
   [../]
   [./planar3]

modules/tensor_mechanics/tests/thermal_expansion/constant_expansion_coeff_restart.i

@@ -37,14 +37,18 @@
   [../]
 []
 
-[Modules/TensorMechanics/Master]
-  [./all]
-    strain = SMALL
-    incremental = true
-    add_variables = true
-    eigenstrain_names = eigenstrain
-    generate_output = 'strain_xx strain_yy strain_zz'
-  [../]
+[Modules]
+    [TensorMechanics]
+        [Master]
+            [./all]
+                strain = SMALL
+                incremental = true
+                add_variables = true
+                eigenstrain_names = eigenstrain
+                generate_output = 'strain_xx strain_yy strain_zz'
+            [../]
+        [../]
+    [../]
 []
 
 [AuxKernels]

modules/tensor_mechanics/tests/volumetric_deform_grad/tests

@@ -8,7 +8,6 @@
     type = 'CSVDiff'
     input = 'elastic_stress.i'
     csvdiff = 'elastic_stress_out.csv'
-    cli_args = 'GlobalParams/volumetric_locking_correction=true'
     prereq = 'elastic'
   [../]
   [./interface]
@@ -20,7 +19,6 @@
     type = 'CSVDiff'
     input = 'volumetric_strain_interface.i'
     csvdiff = 'volumetric_strain_interface_out.csv'
-    cli_args = 'GlobalParams/volumetric_locking_correction=true'
     prereq = 'interface'
   [../]
 []

test/tests/misc/check_error/tests

@@ -270,7 +270,7 @@
   [./missing_active_section_test]
     type = 'RunException'
     input = 'missing_active_section.i'
-    expect_err = "listed as active do not exist"
+    expect_err = "variables listed as active"
   [../]
 
   [./missing_coupled_mat_prop_test]

test/tests/outputs/error/tests

@@ -3,7 +3,7 @@
     # Test error when two outputs with the same name are created (two blocks)
     type = RunException
     input = duplicate_outputs.i
-    expect_err = "supplied multiple times"
+    expect_err = "'exodus' already exists"
   [../]
   [./duplicate_output_files]
     # Test error when two outputs with the same name are created (two blocks)

test/tests/parser/active_inactive/tests

@@ -6,24 +6,24 @@
     cli_args = 'Outputs/exodus=true'
   [../]
 
-  [./inactive_section_missing]
+  [./active_section_missing]
     type = RunException
     input = 'active_inactive.i'
     cli_args = 'AuxKernels/active=aux5'
-    expect_err = 'One or more active/inactive lists in the input file are missing a referenced section'
+    expect_err = "variables listed as active"
   [../]
 
-  [./active_section_missing]
+  [./inactive_section_missing]
     type = RunException
     input = 'active_inactive.i'
     cli_args = 'Kernels/inactive=convection BCs/inactive=top'
-    expect_err = 'One or more active/inactive lists in the input file are missing a referenced section:\nBCs/top\nKernels/convection'
+    expect_err = "variables listed as inactive"
   [../]
 
   [./inactive_active_combo]
     type = RunException
     input = 'active_inactive.i'
     cli_args = 'AuxVariables/active=aux2'
-    expect_err = 'The params \S+ and \S+ are both provided on block'
+    expect_err = "'active' and 'inactive' parameters both provided in section"
   [../]
 []

test/tests/restrictable/api_test/tests

@@ -48,14 +48,14 @@
     expect_err = "isBlockSubset testing passed"
   [../]
 
-  [./hasBlockMaterialProperty=true]
+  [./hasBlockMaterialProperty_true]
     type = 'RunException'
     input = 'block_restrictable.i'
     cli_args = "Kernels/diff/test=hasBlockMaterialProperty_true"
     expect_err = "hasBlockMaterialProperty is true, test passed"
   [../]
 
-  [./hasBlockMaterialProperty=false]
+  [./hasBlockMaterialProperty_false]
     type = 'RunException'
     input = 'block_restrictable.i'
     cli_args = "Kernels/diff/test=hasBlockMaterialProperty_false"
@@ -90,14 +90,14 @@
     expect_err = "isBoundarySubset test passed"
   [../]
 
-  [./hasBoundaryMaterialProperty=true]
+  [./hasBoundaryMaterialProperty_true]
     type = 'RunException'
     input = 'boundary_restrictable.i'
     cli_args = "BCs/left/test=hasBoundaryMaterialProperty_true"
     expect_err = "hasBoundaryMaterialProperty is true, test passed"
   [../]
 
-  [./hasBoundaryMaterialProperty=false]
+  [./hasBoundaryMaterialProperty_false]
     type = 'RunException'
     input = 'boundary_restrictable.i'
     cli_args = "BCs/left/test=hasBoundaryMaterialProperty_false"