HBASE-13084 addendum move replication_admin_test.rb to individual test
Signed-off-by: stack <stack@apache.org>
This commit is contained in:
parent
458846ef7b
commit
f670649f0e
|
@ -0,0 +1,67 @@
|
||||||
|
/**
|
||||||
|
* Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
* or more contributor license agreements. See the NOTICE file
|
||||||
|
* distributed with this work for additional information
|
||||||
|
* regarding copyright ownership. The ASF licenses this file
|
||||||
|
* to you under the Apache License, Version 2.0 (the
|
||||||
|
* "License"); you may not use this file except in compliance
|
||||||
|
* with the License. You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
package org.apache.hadoop.hbase.client;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.apache.hadoop.hbase.HBaseTestingUtility;
|
||||||
|
import org.apache.hadoop.hbase.HConstants;
|
||||||
|
import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
|
||||||
|
import org.apache.hadoop.hbase.security.access.SecureTestUtil;
|
||||||
|
import org.apache.hadoop.hbase.security.visibility.VisibilityTestUtil;
|
||||||
|
import org.jruby.embed.ScriptingContainer;
|
||||||
|
import org.junit.AfterClass;
|
||||||
|
import org.junit.BeforeClass;
|
||||||
|
|
||||||
|
public abstract class AbstractTestShell {
|
||||||
|
|
||||||
|
protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
|
||||||
|
protected final static ScriptingContainer jruby = new ScriptingContainer();
|
||||||
|
|
||||||
|
@BeforeClass
|
||||||
|
public static void setUpBeforeClass() throws Exception {
|
||||||
|
// Start mini cluster
|
||||||
|
TEST_UTIL.getConfiguration().setBoolean("hbase.online.schema.update.enable", true);
|
||||||
|
TEST_UTIL.getConfiguration().setInt("hbase.regionserver.msginterval", 100);
|
||||||
|
TEST_UTIL.getConfiguration().setInt("hbase.client.pause", 250);
|
||||||
|
TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 6);
|
||||||
|
TEST_UTIL.getConfiguration().setBoolean(CoprocessorHost.ABORT_ON_ERROR_KEY, false);
|
||||||
|
TEST_UTIL.getConfiguration().setInt("hfile.format.version", 3);
|
||||||
|
// Security setup configuration
|
||||||
|
SecureTestUtil.enableSecurity(TEST_UTIL.getConfiguration());
|
||||||
|
VisibilityTestUtil.enableVisiblityLabels(TEST_UTIL.getConfiguration());
|
||||||
|
|
||||||
|
TEST_UTIL.startMiniCluster();
|
||||||
|
|
||||||
|
// Configure jruby runtime
|
||||||
|
List<String> loadPaths = new ArrayList();
|
||||||
|
loadPaths.add("src/main/ruby");
|
||||||
|
loadPaths.add("src/test/ruby");
|
||||||
|
jruby.getProvider().setLoadPaths(loadPaths);
|
||||||
|
jruby.put("$TEST_CLUSTER", TEST_UTIL);
|
||||||
|
System.setProperty("jruby.jit.logging.verbose", "true");
|
||||||
|
System.setProperty("jruby.jit.logging", "true");
|
||||||
|
System.setProperty("jruby.native.verbose", "true");
|
||||||
|
}
|
||||||
|
|
||||||
|
@AfterClass
|
||||||
|
public static void tearDownAfterClass() throws Exception {
|
||||||
|
TEST_UTIL.shutdownMiniCluster();
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,38 @@
|
||||||
|
/**
|
||||||
|
* Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
* or more contributor license agreements. See the NOTICE file
|
||||||
|
* distributed with this work for additional information
|
||||||
|
* regarding copyright ownership. The ASF licenses this file
|
||||||
|
* to you under the Apache License, Version 2.0 (the
|
||||||
|
* "License"); you may not use this file except in compliance
|
||||||
|
* with the License. You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
package org.apache.hadoop.hbase.client;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
import org.apache.hadoop.hbase.testclassification.ClientTests;
|
||||||
|
import org.apache.hadoop.hbase.testclassification.LargeTests;
|
||||||
|
import org.jruby.embed.PathType;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.experimental.categories.Category;
|
||||||
|
|
||||||
|
@Category({ ClientTests.class, LargeTests.class })
|
||||||
|
public class TestReplicationShell extends AbstractTestShell {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testRunShellTests() throws IOException {
|
||||||
|
System.setProperty("shell.test.include", "replication_admin_test.rb");
|
||||||
|
// Start all ruby tests
|
||||||
|
jruby.runScriptlet(PathType.ABSOLUTE, "src/test/ruby/tests_runner.rb");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -19,67 +19,21 @@
|
||||||
package org.apache.hadoop.hbase.client;
|
package org.apache.hadoop.hbase.client;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import org.apache.commons.logging.Log;
|
|
||||||
import org.apache.commons.logging.LogFactory;
|
|
||||||
import org.apache.hadoop.hbase.HBaseTestingUtility;
|
|
||||||
import org.apache.hadoop.hbase.HConstants;
|
|
||||||
import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
|
|
||||||
import org.apache.hadoop.hbase.security.access.SecureTestUtil;
|
|
||||||
import org.apache.hadoop.hbase.security.visibility.VisibilityTestUtil;
|
|
||||||
import org.apache.hadoop.hbase.testclassification.ClientTests;
|
import org.apache.hadoop.hbase.testclassification.ClientTests;
|
||||||
import org.apache.hadoop.hbase.testclassification.LargeTests;
|
import org.apache.hadoop.hbase.testclassification.LargeTests;
|
||||||
import org.jruby.embed.PathType;
|
import org.jruby.embed.PathType;
|
||||||
import org.jruby.embed.ScriptingContainer;
|
|
||||||
import org.junit.AfterClass;
|
|
||||||
import org.junit.BeforeClass;
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.experimental.categories.Category;
|
import org.junit.experimental.categories.Category;
|
||||||
|
|
||||||
@Category({ClientTests.class, LargeTests.class})
|
@Category({ ClientTests.class, LargeTests.class })
|
||||||
public class TestShell {
|
public class TestShell extends AbstractTestShell {
|
||||||
final Log LOG = LogFactory.getLog(getClass());
|
|
||||||
private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
|
|
||||||
private final static ScriptingContainer jruby = new ScriptingContainer();
|
|
||||||
|
|
||||||
@BeforeClass
|
|
||||||
public static void setUpBeforeClass() throws Exception {
|
|
||||||
// Start mini cluster
|
|
||||||
TEST_UTIL.getConfiguration().setBoolean("hbase.online.schema.update.enable", true);
|
|
||||||
TEST_UTIL.getConfiguration().setInt("hbase.regionserver.msginterval", 100);
|
|
||||||
TEST_UTIL.getConfiguration().setInt("hbase.client.pause", 250);
|
|
||||||
TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 6);
|
|
||||||
TEST_UTIL.getConfiguration().setBoolean(CoprocessorHost.ABORT_ON_ERROR_KEY, false);
|
|
||||||
TEST_UTIL.getConfiguration().setInt("hfile.format.version", 3);
|
|
||||||
// Security setup configuration
|
|
||||||
SecureTestUtil.enableSecurity(TEST_UTIL.getConfiguration());
|
|
||||||
VisibilityTestUtil.enableVisiblityLabels(TEST_UTIL.getConfiguration());
|
|
||||||
|
|
||||||
TEST_UTIL.startMiniCluster();
|
|
||||||
|
|
||||||
// Configure jruby runtime
|
|
||||||
List<String> loadPaths = new ArrayList();
|
|
||||||
loadPaths.add("src/main/ruby");
|
|
||||||
loadPaths.add("src/test/ruby");
|
|
||||||
jruby.getProvider().setLoadPaths(loadPaths);
|
|
||||||
jruby.put("$TEST_CLUSTER", TEST_UTIL);
|
|
||||||
System.setProperty("jruby.jit.logging.verbose", "true");
|
|
||||||
System.setProperty("jruby.jit.logging", "true");
|
|
||||||
System.setProperty("jruby.native.verbose", "true");
|
|
||||||
}
|
|
||||||
|
|
||||||
@AfterClass
|
|
||||||
public static void tearDownAfterClass() throws Exception {
|
|
||||||
TEST_UTIL.shutdownMiniCluster();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testRunShellTests() throws IOException {
|
public void testRunShellTests() throws IOException {
|
||||||
|
System.setProperty("shell.test.exclude", "replication_admin_test.rb");
|
||||||
// Start all ruby tests
|
// Start all ruby tests
|
||||||
jruby.runScriptlet(PathType.ABSOLUTE, "src/test/ruby/tests_runner.rb");
|
jruby.runScriptlet(PathType.ABSOLUTE, "src/test/ruby/tests_runner.rb");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
|
|
||||||
require 'rubygems'
|
require 'rubygems'
|
||||||
require 'rake'
|
require 'rake'
|
||||||
|
require 'set'
|
||||||
|
|
||||||
unless defined?($TEST_CLUSTER)
|
unless defined?($TEST_CLUSTER)
|
||||||
include Java
|
include Java
|
||||||
|
@ -44,8 +45,25 @@ require 'test_helper'
|
||||||
|
|
||||||
puts "Running tests..."
|
puts "Running tests..."
|
||||||
|
|
||||||
|
if java.lang.System.get_property('shell.test.include')
|
||||||
|
includes = Set.new(java.lang.System.get_property('shell.test.include').split(','))
|
||||||
|
end
|
||||||
|
|
||||||
|
if java.lang.System.get_property('shell.test.exclude')
|
||||||
|
excludes = Set.new(java.lang.System.get_property('shell.test.exclude').split(','))
|
||||||
|
end
|
||||||
|
|
||||||
files = Dir[ File.dirname(__FILE__) + "/**/*_test.rb" ]
|
files = Dir[ File.dirname(__FILE__) + "/**/*_test.rb" ]
|
||||||
files.each do |file|
|
files.each do |file|
|
||||||
|
filename = File.basename(file)
|
||||||
|
if includes != nil && !includes.include?(filename)
|
||||||
|
puts "Skip #{filename} because of not included"
|
||||||
|
next
|
||||||
|
end
|
||||||
|
if excludes != nil && excludes.include?(filename)
|
||||||
|
puts "Skip #{filename} because of excluded"
|
||||||
|
next
|
||||||
|
end
|
||||||
begin
|
begin
|
||||||
load(file)
|
load(file)
|
||||||
rescue => e
|
rescue => e
|
||||||
|
|
Loading…
Reference in New Issue