Fix tests #5184

jmarrec · 2024-05-02T23:09:56Z

Pull request overview

Fixup failing tests on develop after the merge festival

Pull Request Author

Model API Changes / Additions
Any new or modified fields have been implemented in the EnergyPlus ForwardTranslator (and ReverseTranslator as appropriate)
Model API methods are tested (in src/model/test)
EnergyPlus ForwardTranslator Tests (in src/energyplus/Test)
If a new object or method, added a test in NREL/OpenStudio-resources: Add Link
If needed, added VersionTranslation rules for the objects (src/osversion/VersionTranslator.cpp)
Verified that C# bindings built fine on Windows, partial classes used as needed, etc.
All new and existing tests passes
If methods have been deprecated, update rest of code to use the new methods

Labels:

If change to an IDD file, add the label IDDChange
If breaking existing API, add the label APIChange
If deemed ready, add label Pull Request - Ready for CI so that CI builds your PR

Review Checklist

This will not be exhaustively relevant to every PR.

Perform a Code Review on GitHub
Code Style, strip trailing whitespace, etc.
All related changes have been implemented: model changes, model tests, FT changes, FT tests, VersionTranslation, OS App
Labeling is ok
If defect, verify by running develop branch and reproducing defect, then running PR and reproducing fix
If feature, test running new feature, try creative ways to break it
CI status: all green or justified

…tches an error

…e for ages

…rubygems

jmarrec · 2024-05-02T23:11:43Z

src/cli/test/bundle_git/Gemfile

+# gem 'openstudio-extension', git: 'https://github.com/NREL/openstudio-extension-gem.git', ref: 'v0.8.0'
+gem 'simplecov', git: 'https://github.com/simplecov-ruby/simplecov', ref: 'v0.21.2'


Disable using openstudio-extension, cf comment below

jmarrec · 2024-05-02T23:11:59Z

src/cli/test/bundle_git/test.rb

+# TODO: until we have gems on rubygems, this is unpractical without forcing a
+# download from git for all openstudio-extension, measure-tester, and workflow
+# gems
+
+# # test a github checkout gem
+# require 'openstudio'
+# require 'openstudio/extension'
+# puts OpenStudio::Extension::VERSION
+# raise "OpenStudio Extension version does not match" unless OpenStudio::Extension::VERSION.to_s == '0.8.0'
+
+# did_fail = false
+# begin
+#   require 'openstudio-standards'
+# rescue LoadError
+#   did_fail = true
+# end
+# raise "Should allow to load the embedded openstudio-standards" unless did_fail == false


Note the comment here.

@DavidGoldwasser was working on gettig all of the gems published yesterday. The plan is to have this done prior to an RC2. (maybe today?)

jmarrec · 2024-05-02T23:12:06Z

src/cli/test/run_minitest_fail.py

@@ -68,7 +68,7 @@ def run_file(
    )

    r = subprocess.run(
-        [str(args.ruby_or_cli_path), "-e", "at exit { exit 12 }"],
+        [str(args.ruby_or_cli_path), "-e", "at_exit { exit 12 }"],


jmarrec · 2024-05-02T23:14:08Z

src/cli/test/test_embedded_help.rb

+    no_block_glob = Dir["*.txt", "*.cpp"]
    assert_instance_of(Array, no_block_glob)
    assert_includes(no_block_glob, 'CMakeLists.txt')
-    assert_includes(no_block_glob, 'embedded_help.rb')
-    puts no_block_glob.index('test_embedded_help.rb')
-    assert_nil(no_block_glob.index('test_embedded_help.rb'))
+    assert_includes(no_block_glob, 'main.cpp')
+    assert_nil(no_block_glob.index('test_main.cpp'))


embedded_help.rb is no longer in the src/cli directory, but in the ruby/engine dir, so adjust the test. It must have been failing, silently, for a year and a half since 50f6c03

jmarrec · 2024-05-02T23:14:28Z

src/cli/test/test_embedded_ruby.rb

-  def test_sdbm
-    require 'sdbm'
-
-    SDBM.open 'my_database' do |db|
-      db['apple'] = 'fruit'
-      db['pear'] = 'fruit'
-      db['carrot'] = 'vegetable'
-      db['tomato'] = 'vegetable'
-    end
-    assert(true)
-  end


This gem has been gone for...? ever I would say.

jmarrec · 2024-05-02T23:14:39Z

src/cli/test/test_embedded_ruby.rb

@@ -234,6 +222,7 @@ def test_msgpack
  end

  def test_json_schemer
+    skip("Disabled due to unf_ext, see https://github.com/NREL/openstudio-gems/issues/72")


Disable with a comment

jmarrec · 2024-05-02T23:15:15Z

src/cli/test/test_loglevel.py

+    if logLevel in ['Trace', 'Debug']:
+        assert f"[openstudio.CLI] <-2> Setting Log Level to {logLevel} ({loglevel_int_value})" in lines


Adjust test with recent changes

jmarrec · 2024-05-02T23:15:29Z

src/workflow/RunEnergyPlus.cpp

@@ -163,7 +163,7 @@ void OSWorkflow::runEnergyPlus() {
      LOG(Info, "Running command '" << cmd << "'");

      int result = 0;
-      detailedTimeBlock("Running ExpandObjects", [this, /*&cmd,*/ &result, &runDirPath, &runDirResults, &stdout_ofs] {
+      detailedTimeBlock("Running ExpandObjects", [this, /*&cmd,*/ &result, &runDirResults, &stdout_ofs] {


clang 15 complains when unused lambda capture.

ci-commercialbuildings · 2024-05-02T23:50:09Z

CI Results for 05ca3f6:

Ubuntu 20.04:
- OpenStudio-3.8.0-rc1+05ca3f67a5-Ubuntu-20.04-x86_64.deb
- OpenStudio-3.8.0-rc1+05ca3f67a5-Ubuntu-20.04-x86_64.tar.gz
Ubuntu 22.04:
- OpenStudio-3.8.0-rc1+05ca3f67a5-Ubuntu-22.04-x86_64.deb
- OpenStudio-3.8.0-rc1+05ca3f67a5-Ubuntu-22.04-x86_64.tar.gz
Darwin:
- OpenStudio-3.8.0-rc1+05ca3f67a5-Darwin-x86_64.dmg
- OpenStudio-3.8.0-rc1+05ca3f67a5-Darwin-x86_64.tar.gz
Windows:
- OpenStudio-3.8.0-rc1+05ca3f67a5-Windows.exe
- OpenStudio-3.8.0-rc1+05ca3f67a5-Windows.tar.gz
Code Coverage:

jmarrec · 2024-05-03T00:01:13Z

The tests are passing on my mac. I think the issue is that the runner doesn't have ruby 3.2.2 activated with bundler installed when it tries to run the tests that match -R CLITest-test_bundle. @wenyikuang

ctest -R CLITest-test_bundle
Test project /Users/julien/Software/Others/OS-build-release
    Start 3894: CLITest-test_bundle-bundle
1/7 Test #3894: CLITest-test_bundle-bundle ...................   Passed    9.02 sec
    Start 3895: CLITest-test_bundle-bundle_git
2/7 Test #3895: CLITest-test_bundle-bundle_git ...............   Passed   10.66 sec
    Start 3896: CLITest-test_bundle-bundle_native
3/7 Test #3896: CLITest-test_bundle-bundle_native ............   Passed    6.66 sec
    Start 3897: CLITest-test_bundle-bundle_native_embedded
4/7 Test #3897: CLITest-test_bundle-bundle_native_embedded ...   Passed    9.97 sec
    Start 3898: CLITest-test_bundle-bundle_no_install
5/7 Test #3898: CLITest-test_bundle-bundle_no_install ........   Passed    6.89 sec
    Start 3899: CLITest-test_bundle-no_bundle
6/7 Test #3899: CLITest-test_bundle-no_bundle ................   Passed    7.89 sec
    Start 3900: CLITest-test_bundle-bundle_default
7/7 Test #3900: CLITest-test_bundle-bundle_default ...........   Passed    7.88 sec

100% tests passed, 0 tests failed out of 7

Total Test time (real) =  59.10 sec

$ ruby --version
ruby 3.2.2 (2023-03-30 revision e51014f9c0) [arm64-darwin23]

$ bundle --version
Bundler version 2.4.10

$ gem info bundler

*** LOCAL GEMS ***

bundler (2.5.5, 2.4.10, 2.1.4)
    Authors: André Arko, Samuel Giddins, Colby Swandale, Hiroshi
    Shibata, David Rodríguez, Grey Baker, Stephanie Morillo, Chris
    Morris, James Wen, Tim Moore, André Medeiros, Jessica Lynn Suttles,
    Terence Lee, Carl Lerche, Yehuda Katz
    Homepage: https://bundler.io
    License: MIT
    Installed at (default): /Users/julien/.rvm/rubies/ruby-3.2.2/lib/ruby/gems/3.2.0

    The best way to manage your application's dependencies

wenyikuang · 2024-05-03T05:25:55Z

Yeah, I am pushing the new cmake docker image comes with ruby3.

wenyikuang · 2024-05-03T06:50:52Z

Running (https://ci.openstudio.net/blue/organizations/jenkins/openstudio-incremental-ubuntu-20-04/detail/PR-5184/6/pipeline/49/) , need to update the CONAN_HOME in my docker image to /root/ to align with other docker images tomorrow.

wenyikuang · 2024-05-06T06:22:17Z

Updated the image in the master after we merge the PR. Now all them should be align with the local environments.

jmarrec added 7 commits May 3, 2024 00:19

Unbrick the build with clang 15, which complains lambda capture unused

6b6e2ad

Fix the RubyEngine tests that will exit(1) because RubyEngine dtor ca…

d7897b1

…tches an error

Typo in a test

c75b507

embedded_ruby: json_schemer is disabled so skip it, sdbm has been gon…

416963a

…e for ages

Update the embedded_help (Dir / glob) test now that the file has moved.

501d4f2

Adjust test_log_level

6c9a6c1

bundle_git test: disable a portion for now until we have stuff up on …

05ca3f6

…rubygems

jmarrec added Developer Issue component - CLI Pull Request - Ready for CI This pull request if finalized and is ready for continuous integration verification prior to merge. component - Ruby bindings labels May 2, 2024

jmarrec requested a review from kbenne May 2, 2024 23:09

jmarrec self-assigned this May 2, 2024

jmarrec commented May 2, 2024

View reviewed changes

jmarrec merged commit d671778 into develop May 3, 2024
2 of 6 checks passed

jmarrec deleted the fix_tests branch May 3, 2024 12:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix tests #5184

Fix tests #5184

jmarrec commented May 2, 2024

jmarrec May 2, 2024

jmarrec May 2, 2024

kbenne May 3, 2024

jmarrec May 2, 2024

jmarrec May 2, 2024

jmarrec May 2, 2024

jmarrec May 2, 2024

jmarrec May 2, 2024

jmarrec May 2, 2024

ci-commercialbuildings commented May 2, 2024 •

edited

Loading

jmarrec commented May 3, 2024 •

edited

Loading

wenyikuang commented May 3, 2024

wenyikuang commented May 3, 2024 •

edited

Loading

wenyikuang commented May 6, 2024

		# gem 'openstudio-extension', git: 'https://github.com/NREL/openstudio-extension-gem.git', ref: 'v0.8.0'
		gem 'simplecov', git: 'https://github.com/simplecov-ruby/simplecov', ref: 'v0.21.2'

		if logLevel in ['Trace', 'Debug']:
		assert f"[openstudio.CLI] <-2> Setting Log Level to {logLevel} ({loglevel_int_value})" in lines

Fix tests #5184

Fix tests #5184

Conversation

jmarrec commented May 2, 2024

Pull request overview

Pull Request Author

Review Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ci-commercialbuildings commented May 2, 2024 • edited Loading

jmarrec commented May 3, 2024 • edited Loading

wenyikuang commented May 3, 2024

wenyikuang commented May 3, 2024 • edited Loading

wenyikuang commented May 6, 2024

ci-commercialbuildings commented May 2, 2024 •

edited

Loading

jmarrec commented May 3, 2024 •

edited

Loading

wenyikuang commented May 3, 2024 •

edited

Loading