From a35d0eae5e72af721723a0c8ab319ea1ab0440f7 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 20 Sep 2019 07:22:49 +0000 Subject: [PATCH 1/5] trying to get the .travis to error --- config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.yaml b/config.yaml index 34584fd2d..92ccbc9fe 100644 --- a/config.yaml +++ b/config.yaml @@ -18,7 +18,7 @@ beef: # Used by both the RESTful API and the Admin interface credentials: user: "beef" - passwd: "beeF" + passwd: "beeff" # Interface / IP restrictions restrictions: From ad3927485c70c868c064f534d9834abaeda784d3 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 20 Sep 2019 07:37:59 +0000 Subject: [PATCH 2/5] should force a fail --- test/unit/tc_filesystem.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/unit/tc_filesystem.rb b/test/unit/tc_filesystem.rb index 98ef13d97..48a8a81ea 100644 --- a/test/unit/tc_filesystem.rb +++ b/test/unit/tc_filesystem.rb @@ -34,6 +34,7 @@ class TC_Filesystem < Test::Unit::TestCase user_cred=YAML.load_file(test_file) x= user_cred['beef']['credentials'] assert_equal({"passwd"=>"beef", "user"=>"beef"}, x, 'The default creds are not set' ) + exit 1 end def test_install_file From 731527e259f2217bcb6d1494c10453ca1dc0ab22 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 20 Sep 2019 07:58:21 +0000 Subject: [PATCH 3/5] changing back the gem and test plus travis --- .travis.yml | 3 +++ Gemfile | 13 ------------- test/unit/tc_filesystem.rb | 1 - 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index c8f45bff7..3e2560c1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,3 +21,6 @@ addons: - zlib1g-dev - liblzma-dev - libcurl4-openssl-dev +script: + - bundle exec rake build + - bundle exec rake builddoc diff --git a/Gemfile b/Gemfile index bfea88ee6..ac948cae7 100644 --- a/Gemfile +++ b/Gemfile @@ -77,19 +77,6 @@ end # For running unit tests group :test do - - if defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby" - module Kernel - alias :_at_exit :at_exit - def at_exit(&block) - _at_exit do - exit_status = $!.status if $!.is_a?(SystemExit) - block.call - exit exit_status if exit_status - end - end - end - end if ENV['BEEF_TEST'] gem 'test-unit' gem 'test-unit-full' diff --git a/test/unit/tc_filesystem.rb b/test/unit/tc_filesystem.rb index 48a8a81ea..98ef13d97 100644 --- a/test/unit/tc_filesystem.rb +++ b/test/unit/tc_filesystem.rb @@ -34,7 +34,6 @@ class TC_Filesystem < Test::Unit::TestCase user_cred=YAML.load_file(test_file) x= user_cred['beef']['credentials'] assert_equal({"passwd"=>"beef", "user"=>"beef"}, x, 'The default creds are not set' ) - exit 1 end def test_install_file From d8f838980f9aeed0b40f8c3d5bb59fde6ed876b3 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 20 Sep 2019 08:11:39 +0000 Subject: [PATCH 4/5] changed the travis back --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3e2560c1a..aa434f4dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,4 @@ addons: - zlib1g-dev - liblzma-dev - libcurl4-openssl-dev -script: - - bundle exec rake build - - bundle exec rake builddoc + From 0531cdf74554f5735b0b593684e47154e06b7051 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 20 Sep 2019 08:16:16 +0000 Subject: [PATCH 5/5] config --- config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.yaml b/config.yaml index 92ccbc9fe..d79087c6a 100644 --- a/config.yaml +++ b/config.yaml @@ -18,7 +18,7 @@ beef: # Used by both the RESTful API and the Admin interface credentials: user: "beef" - passwd: "beeff" + passwd: "beef" # Interface / IP restrictions restrictions: