HBASE-23992 Fix TestAdminShell and TestQuotasShell mistakenly broken by parent commit

This commit is contained in:
stack 2020-03-14 15:17:20 -07:00
parent eefeeceedf
commit f66cbe1a40
2 changed files with 4 additions and 3 deletions

View File

@ -361,7 +361,7 @@ module Hbase
assert(output.include?('2 row(s)')) assert(output.include?('2 row(s)'))
assert(output.include?('QUOTAS')) 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?('VIOLATION_POLICY => NO_INSERTS'))
assert(output.include?('TYPE => SPACE')) assert(output.include?('TYPE => SPACE'))
assert(output.include?('1 row(s)')) assert(output.include?('1 row(s)'))
@ -383,12 +383,13 @@ module Hbase
POLICY => NO_INSERTS, POLICY => NO_INSERTS,
NAMESPACE => ns) NAMESPACE => ns)
output = capture_stdout { command(:describe_namespace, ns) } output = capture_stdout { command(:describe_namespace, ns) }
puts output
assert(output.include?('DESCRIPTION')) assert(output.include?('DESCRIPTION'))
assert(output.include?("NAME => '#{ns}'")) assert(output.include?("NAME => '#{ns}'"))
assert(output.include?('QUOTAS')) 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?('VIOLATION_POLICY => NO_INSERTS'))
assert(output.include?('TYPE => SPACE')) assert(output.include?('TYPE => SPACE'))
assert(output.include?('1 row(s)')) assert(output.include?('1 row(s)'))

View File

@ -180,7 +180,7 @@ module Hbase
define_test 'can set and remove quota' do define_test 'can set and remove quota' do
command(:set_quota, TYPE => SPACE, LIMIT => '1G', POLICY => NO_INSERTS, TABLE => @test_name) command(:set_quota, TYPE => SPACE, LIMIT => '1G', POLICY => NO_INSERTS, TABLE => @test_name)
output = capture_stdout{ command(:list_quotas) } 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?("VIOLATION_POLICY => NO_INSERTS"))
assert(output.include?("TYPE => SPACE")) assert(output.include?("TYPE => SPACE"))
assert(output.include?("TABLE => #{@test_name}")) assert(output.include?("TABLE => #{@test_name}"))