Skip to content
Merged
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ test/*out_*.sqltest
test/*out_*.xml
# TODO: keep updating as new versions are incoming
# We do not commit the current develop version until it's final
test/*_3.10.0*_out.osw
test/*_3.10.0*_out*.status
test/*_3.10.0*_out.sqltest
test/*_3.10.0*_out*.xml
test/*_3.11.0*_out.osw
test/*_3.11.0*_out*.status
test/*_3.11.0*_out.sqltest
test/*_3.11.0*_out*.xml
# Ignore alphas and rcs. CI will force add anything under test/ so it's unaffected
test/*_[0-9].[0-9].[0-9]-*_out*

Expand Down
41 changes: 31 additions & 10 deletions Analyzing_Regression_Tests.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,16 @@
")"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
"df_files = filter_on_space_enabled(df_files, False)\n",
"df_files.columns = df_files.columns.droplevel('Tag')"
]
},
{
"cell_type": "code",
"execution_count": null,
Expand Down Expand Up @@ -615,15 +625,26 @@
"source": [
"(\n",
" success[\n",
" success[\n",
" (\n",
" \"24.1.0\",\n",
" \"3.8.0\",\n",
" #'ca1c536250'\n",
" \"WithoutSpaces\",\n",
" )\n",
" ]\n",
" != \"Success\"\n",
" (\n",
" success[\n",
" (\n",
" \"24.2.0\",\n",
" \"3.9.0\",\n",
" #'ca1c536250'\n",
" #\"WithoutSpaces\",\n",
" )\n",
" ] == \"Success\"\n",
" ) &\n",
" (\n",
" success[\n",
" (\n",
" \"25.1.0\",\n",
" \"3.10.0\",\n",
" #'ca1c536250'\n",
" #\"WithoutSpaces\",\n",
" )\n",
" ] != \"Success\"\n",
" )\n",
" ]\n",
" .style.applymap(background_colors)\n",
" .set_table_styles(styles)\n",
Expand Down Expand Up @@ -669,7 +690,7 @@
"# Output command to rerun the tests that used to run in the previous version\n",
"# and now don't\n",
"torun = success[\n",
" (success[(\"23.2.0\", \"3.7.0\", \"\")] == \"Success\") & (success[(\"24.1.0\", \"3.8.0-rc2\", \"ca1c536250\")] != \"Success\")\n",
" (success[(\"24.2.0\", \"3.9.0\")] == \"Success\") & (success[(\"25.1.0\", \"3.10.0\")] != \"Success\")\n",
"]\n",
"\n",
"# s = \"CUSTOMTAG=SHA /home/julien/Software/Others/OS-build/Products/openstudio-2.7.0 model_tests.rb -n '/\"\n",
Expand Down
20 changes: 20 additions & 0 deletions SDD_tests.rb
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,10 @@ def test_FT_coilsystem_integrated_heatpump
sdd_ft_test('coilsystem_integrated_heatpump.osm')
end

def test_FT_coilsystem_cooling_water
sdd_ft_test('coilsystem_cooling_water.osm')
end

def test_FT_coilsystem_waterhx
sdd_ft_test('coilsystem_waterhx.osm')
end
Expand Down Expand Up @@ -601,6 +605,10 @@ def test_FT_output_objects_2
sdd_ft_test('output_objects_2.osm')
end

def test_FT_output_tables
sdd_ft_test('output_tables.osm')
end

def test_FT_photovoltaics
sdd_ft_test('photovoltaics.osm')
end
Expand Down Expand Up @@ -653,6 +661,10 @@ def test_FT_python_plugin
sdd_ft_test('python_plugin.osm')
end

def test_FT_python_plugin_search_paths
sdd_ft_test('python_plugin_search_paths.osm')
end

def test_FT_refrigeration_system
sdd_ft_test('refrigeration_system.osm')
end
Expand Down Expand Up @@ -773,6 +785,10 @@ def test_FT_thermal_storage
sdd_ft_test('thermal_storage.osm')
end

def test_FT_thermochromic_windows
sdd_ft_test('thermochromic_windows.osm')
end

def test_FT_transformer
sdd_ft_test('transformer.osm')
end
Expand Down Expand Up @@ -869,6 +885,10 @@ def test_FT_zone_hvac_cooling_panel
sdd_ft_test('zone_hvac_cooling_panel.osm')
end

def test_FT_zone_hvac_evaporative_cooler
sdd_ft_test('zone_hvac_evaporative_cooler.osm')
end

def test_FT_zone_hvac_equipment_list
sdd_ft_test('zone_hvac_equipment_list.osm')
end
Expand Down
6 changes: 5 additions & 1 deletion highlevel_tests.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,11 @@ def test_rbs_are_defined_sim_tests
def test_pys_are_defined_sim_tests
all_python_paths = Dir.glob(File.join($ModelDir, '*.py'))
all_python_filenames = all_python_paths.map { |p| File.basename(p) }
all_python_filenames -= ['python_plugin_program.py', 'python_plugin_search_paths_script.py']
all_python_filenames -= [
'python_plugin_program.py',
'python_plugin_search_paths_program.py',
'python_plugin_search_paths_script.py'
]

content = File.read('model_tests.rb')
sim_test_re = Regexp.new('def test_.*\n(?:\s*#)*\s+result = sim_test\(\'(?<filename>.*\.py)\'\)\n(?:\s*#)*\s+end')
Expand Down
Loading