From f66cbe1a40cd9d4cd4abd27c7ac9d1a5168b885f Mon Sep 17 00:00:00 2001 From: stack Date: Sat, 14 Mar 2020 15:17:20 -0700 Subject: [PATCH] HBASE-23992 Fix TestAdminShell and TestQuotasShell mistakenly broken by parent commit --- hbase-shell/src/test/ruby/hbase/admin_test.rb | 5 +++-- hbase-shell/src/test/ruby/hbase/quotas_test.rb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hbase-shell/src/test/ruby/hbase/admin_test.rb b/hbase-shell/src/test/ruby/hbase/admin_test.rb index 8f7340d52ea..1e04f89c44c 100644 --- a/hbase-shell/src/test/ruby/hbase/admin_test.rb +++ b/hbase-shell/src/test/ruby/hbase/admin_test.rb @@ -361,7 +361,7 @@ module Hbase assert(output.include?('2 row(s)')) assert(output.include?('QUOTAS')) - assert(output.include?('LIMIT => 1G')) + assert(output.include?('LIMIT => 1.00G')) assert(output.include?('VIOLATION_POLICY => NO_INSERTS')) assert(output.include?('TYPE => SPACE')) assert(output.include?('1 row(s)')) @@ -383,12 +383,13 @@ module Hbase POLICY => NO_INSERTS, NAMESPACE => ns) output = capture_stdout { command(:describe_namespace, ns) } + puts output assert(output.include?('DESCRIPTION')) assert(output.include?("NAME => '#{ns}'")) assert(output.include?('QUOTAS')) - assert(output.include?('LIMIT => 1G')) + assert(output.include?('LIMIT => 1.00G')) assert(output.include?('VIOLATION_POLICY => NO_INSERTS')) assert(output.include?('TYPE => SPACE')) assert(output.include?('1 row(s)')) diff --git a/hbase-shell/src/test/ruby/hbase/quotas_test.rb b/hbase-shell/src/test/ruby/hbase/quotas_test.rb index bc51fc4123d..21c81faaede 100644 --- a/hbase-shell/src/test/ruby/hbase/quotas_test.rb +++ b/hbase-shell/src/test/ruby/hbase/quotas_test.rb @@ -180,7 +180,7 @@ module Hbase define_test 'can set and remove quota' do command(:set_quota, TYPE => SPACE, LIMIT => '1G', POLICY => NO_INSERTS, TABLE => @test_name) output = capture_stdout{ command(:list_quotas) } - assert(output.include?("LIMIT => 1G")) + assert(output.include?("LIMIT => 1.00G")) assert(output.include?("VIOLATION_POLICY => NO_INSERTS")) assert(output.include?("TYPE => SPACE")) assert(output.include?("TABLE => #{@test_name}"))