From 74cc8eea07281528fdb18631696ef907990dd1fb Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Wed, 2 May 2018 07:32:14 +0200 Subject: [PATCH] Compatibility with Ruby 1.8.7 (main app test), tests fixed for CentOS6 --- src/tl/unit_tests/tlHttpStream.cc | 5 ++++- testdata/klayout_main/main.rb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/tl/unit_tests/tlHttpStream.cc b/src/tl/unit_tests/tlHttpStream.cc index 298cb60e1..a5b94df9d 100644 --- a/src/tl/unit_tests/tlHttpStream.cc +++ b/src/tl/unit_tests/tlHttpStream.cc @@ -23,6 +23,7 @@ #include "tlHttpStream.h" #include "tlUnitTest.h" +#include "tlTimer.h" #include @@ -100,10 +101,12 @@ TEST(3) stream.send (); EXPECT_EQ (stream.data_available (), false); - while (! stream.data_available ()) { + tl::Clock start = tl::Clock::current (); + while (! r.flag && (tl::Clock::current () - start).seconds () < 10) { QCoreApplication::processEvents (QEventLoop::ExcludeUserInputEvents); } EXPECT_EQ (r.flag, true); + EXPECT_EQ (stream.data_available (), true); char b[100]; size_t n = stream.read (b, sizeof (b)); diff --git a/testdata/klayout_main/main.rb b/testdata/klayout_main/main.rb index 228f5d44a..1601ce803 100644 --- a/testdata/klayout_main/main.rb +++ b/testdata/klayout_main/main.rb @@ -60,7 +60,7 @@ class KLayoutMain_TestClass < TestBase def test_4 # Application class - if !RBA.constants.find { |x| x == :QDialog } + if !RBA.constants.find { |x| x == :QDialog || x == "QDialog" } out = `./klayout -b -r #{File.join(File.dirname(__FILE__), "test_app.rb")}` assert_equal(out, "RBA::Application superclass Object\nMainWindow is not there\n")