You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by an...@apache.org on 2018/10/19 12:40:23 UTC
[25/51] [partial] zookeeper git commit: ZOOKEEPER-3032: MAVEN
MIGRATION - zookeeper-server
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/java/org/apache/zookeeper/test/ZooKeeperTestClient.java
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ZooKeeperTestClient.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/ZooKeeperTestClient.java
deleted file mode 100644
index a0cba91..0000000
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ZooKeeperTestClient.java
+++ /dev/null
@@ -1,467 +0,0 @@
-/**
- * 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.zookeeper.test;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.Watcher;
-import org.apache.zookeeper.ZKTestCase;
-import org.apache.zookeeper.ZooKeeper;
-import org.apache.zookeeper.KeeperException.Code;
-import org.apache.zookeeper.Watcher.Event.EventType;
-import org.apache.zookeeper.ZooDefs.Ids;
-import org.apache.zookeeper.common.Time;
-import org.apache.zookeeper.data.Stat;
-import org.apache.zookeeper.server.ServerCnxnFactory;
-import org.apache.zookeeper.server.ZooKeeperServer;
-import org.junit.Assert;
-
-public class ZooKeeperTestClient extends ZKTestCase implements Watcher {
- protected String hostPort = "127.0.0.1:22801";
-
- protected static final String dirOnZK = "/test_dir";
-
- protected String testDirOnZK = dirOnZK + "/" + Time.currentElapsedTime();
-
- LinkedBlockingQueue<WatchedEvent> events = new LinkedBlockingQueue<WatchedEvent>();
-
- private WatchedEvent getEvent(int numTries) throws InterruptedException {
- WatchedEvent event = null;
- for (int i = 0; i < numTries; i++) {
- System.out.println("i = " + i);
- event = events.poll(10, TimeUnit.SECONDS);
- if (event != null) {
- break;
- }
- Thread.sleep(5000);
- }
- return event;
-
- }
-
- private void deleteZKDir(ZooKeeper zk, String nodeName)
- throws IOException, InterruptedException, KeeperException {
-
- Stat stat = zk.exists(nodeName, false);
- if (stat == null) {
- return;
- }
-
- List<String> children1 = zk.getChildren(nodeName, false);
- List<String> c2 = zk.getChildren(nodeName, false, stat);
-
- if (!children1.equals(c2)) {
- Assert.fail("children lists from getChildren()/getChildren2() do not match");
- }
-
- if (!stat.equals(stat)) {
- Assert.fail("stats from exists()/getChildren2() do not match");
- }
-
- if (children1.size() == 0) {
- zk.delete(nodeName, -1);
- return;
- }
- for (String n : children1) {
- deleteZKDir(zk, n);
- }
- }
-
- private void checkRoot() throws IOException,
- InterruptedException {
- ZooKeeper zk = new ZooKeeper(hostPort, 10000, this);
-
- try {
- zk.create(dirOnZK, null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
- } catch (KeeperException.NodeExistsException ke) {
- // expected, sort of
- } catch (KeeperException ke) {
- Assert.fail("Unexpected exception code for create " + dirOnZK + ": "
- + ke.getMessage());
- }
-
- try {
- zk.create(testDirOnZK, null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
- } catch (KeeperException.NodeExistsException ke) {
- // expected, sort of
- } catch (KeeperException ke) {
- Assert.fail("Unexpected exception code for create " + testDirOnZK + ": "
- + ke.getMessage());
- }
-
- zk.close();
- }
-
- private void enode_test_1() throws IOException,
- InterruptedException, KeeperException {
- checkRoot();
- String parentName = testDirOnZK;
- String nodeName = parentName + "/enode_abc";
- ZooKeeper zk = new ZooKeeper(hostPort, 10000, this);
-
- Stat stat = zk.exists(parentName, false);
- if (stat == null) {
- try {
- zk.create(parentName, null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
- } catch (KeeperException ke) {
- Assert.fail("Creating node " + parentName + ke.getMessage());
- }
- }
-
- try {
- zk.create(nodeName, null, Ids.OPEN_ACL_UNSAFE, CreateMode.EPHEMERAL);
- } catch (KeeperException ke) {
- Code code = ke.code();
- boolean valid = code == KeeperException.Code.NODEEXISTS;
- if (!valid) {
- Assert.fail("Unexpected exception code for createin: " + ke.getMessage());
- }
- }
-
- stat = zk.exists(nodeName, false);
- if (stat == null) {
- Assert.fail("node " + nodeName + " should exist");
- }
- System.out.println("Closing client with sessionid: 0x"
- + Long.toHexString(zk.getSessionId()));
- zk.close();
- zk = new ZooKeeper(hostPort, 10000, this);
-
- for (int i = 0; i < 10; i++) {
- System.out.println("i = " + i);
- stat = zk.exists(nodeName, false);
- if (stat != null) {
- System.out.println("node " + nodeName
- + " should not exist after reconnection close");
- } else {
- System.out.println("node " + nodeName
- + " is gone after reconnection close!");
- break;
- }
- Thread.sleep(5000);
- }
- deleteZKDir(zk, nodeName);
- zk.close();
-
- }
-
- private void enode_test_2() throws IOException,
- InterruptedException, KeeperException {
- checkRoot();
- String parentName = testDirOnZK;
- String nodeName = parentName + "/enode_abc";
- ZooKeeper zk = new ZooKeeper(hostPort, 10000, this);
- ZooKeeper zk_1 = new ZooKeeper(hostPort, 10000, this);
-
- Stat stat_parent = zk_1.exists(parentName, false);
- if (stat_parent == null) {
- try {
- zk.create(parentName, null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
- } catch (KeeperException ke) {
- Assert.fail("Creating node " + parentName + ke.getMessage());
- }
- }
-
- Stat stat_node = zk_1.exists(nodeName, false);
- if (stat_node != null) {
-
- try {
- zk.delete(nodeName, -1);
- } catch (KeeperException ke) {
- Code code = ke.code();
- boolean valid = code == KeeperException.Code.NONODE
- || code == KeeperException.Code.NOTEMPTY;
- if (!valid) {
- Assert.fail("Unexpected exception code for delete: " + ke.getMessage());
- }
- }
- }
-
- List<String> firstGen1 = zk_1.getChildren(parentName, true);
- Stat stat = new Stat();
- List<String> firstGen2 = zk_1.getChildren(parentName, true, stat);
-
- if (!firstGen1.equals(firstGen2)) {
- Assert.fail("children lists from getChildren()/getChildren2() do not match");
- }
-
- if (!stat_parent.equals(stat)) {
- Assert.fail("stat from exists()/getChildren() do not match");
- }
-
- try {
- zk.create(nodeName, null, Ids.OPEN_ACL_UNSAFE, CreateMode.EPHEMERAL);
- } catch (KeeperException ke) {
- Code code = ke.code();
- boolean valid = code == KeeperException.Code.NODEEXISTS;
- if (!valid) {
- Assert.fail("Unexpected exception code for createin: " + ke.getMessage());
- }
- }
-
- Thread.sleep(5000);
- WatchedEvent event = events.poll(10, TimeUnit.SECONDS);
- if (event == null) {
- throw new IOException("No event was delivered promptly");
- }
- if (event.getType() != EventType.NodeChildrenChanged
- || !event.getPath().equalsIgnoreCase(parentName)) {
- Assert.fail("Unexpected event was delivered: " + event.toString());
- }
-
- stat_node = zk_1.exists(nodeName, false);
- if (stat_node == null) {
- Assert.fail("node " + nodeName + " should exist");
- }
-
- try {
- zk.delete(parentName, -1);
- Assert.fail("Should be impossible to delete a non-empty node " + parentName);
- } catch (KeeperException ke) {
- Code code = ke.code();
- boolean valid = code == KeeperException.Code.NOTEMPTY;
- if (!valid) {
- Assert.fail("Unexpected exception code for delete: " + code);
- }
- }
-
- try {
- zk.create(nodeName + "/def", null, Ids.OPEN_ACL_UNSAFE, CreateMode.EPHEMERAL);
- Assert.fail("Should be impossible to create child off Ephemeral node " + nodeName);
- } catch (KeeperException ke) {
- Code code = ke.code();
- boolean valid = code == KeeperException.Code.NOCHILDRENFOREPHEMERALS;
- if (!valid) {
- Assert.fail("Unexpected exception code for createin: " + code);
- }
- }
-
- try {
- List<String> children1 = zk.getChildren(nodeName, false);
- List<String> children2 = zk.getChildren(nodeName, false, null);
-
- if (!children1.equals(children2)) {
- Assert.fail("children lists from getChildren()/getChildren2() does not match");
- }
-
- if (children1.size() > 0) {
- Assert.fail("ephemeral node " + nodeName + " should not have children");
- }
- } catch (KeeperException ke) {
- Code code = ke.code();
- boolean valid = code == KeeperException.Code.NONODE;
- if (!valid) {
- Assert.fail("Unexpected exception code for createin: " + code);
- }
- }
- firstGen1 = zk_1.getChildren(parentName, true);
- firstGen2 = zk_1.getChildren(parentName, true, null);
-
- if (!firstGen1.equals(firstGen2)) {
- Assert.fail("children list from getChildren()/getChildren2() does not match");
- }
-
- stat_node = zk_1.exists(nodeName, true);
- if (stat_node == null) {
- Assert.fail("node " + nodeName + " should exist");
- }
- System.out.println("session id of zk: " + zk.getSessionId());
- System.out.println("session id of zk_1: " + zk_1.getSessionId());
- zk.close();
-
- zk_1.exists("nosuchnode", false);
-
- event = this.getEvent(10);
- if (event == null) {
- throw new Error("First event was not delivered promptly");
- }
- if (!((event.getType() == EventType.NodeChildrenChanged &&
- event.getPath().equalsIgnoreCase(parentName)) ||
- (event.getType() == EventType.NodeDeleted &&
- event.getPath().equalsIgnoreCase(nodeName)))) {
- System.out.print(parentName + " "
- + EventType.NodeChildrenChanged + " " + nodeName + " " + EventType.NodeDeleted);
- Assert.fail("Unexpected first event was delivered: " + event.toString());
- }
-
- event = this.getEvent(10);
-
- if (event == null) {
- throw new Error("Second event was not delivered promptly");
- }
- if (!((event.getType() == EventType.NodeChildrenChanged &&
- event.getPath().equalsIgnoreCase(parentName)) ||
- (event.getType() == EventType.NodeDeleted &&
- event.getPath().equalsIgnoreCase(nodeName)))) {
- System.out.print(parentName + " "
- + EventType.NodeChildrenChanged + " " + nodeName + " " + EventType.NodeDeleted);
- Assert.fail("Unexpected second event was delivered: " + event.toString());
- }
-
- firstGen1 = zk_1.getChildren(parentName, false);
- stat_node = zk_1.exists(nodeName, false);
- if (stat_node != null) {
- Assert.fail("node " + nodeName + " should have been deleted");
- }
- if (firstGen1.contains(nodeName)) {
- Assert.fail("node " + nodeName + " should not be a children");
- }
- deleteZKDir(zk_1, nodeName);
- zk_1.close();
- }
-
- private void delete_create_get_set_test_1() throws
- IOException, InterruptedException, KeeperException {
- checkRoot();
- ZooKeeper zk = new ZooKeeper(hostPort, 10000, this);
- String parentName = testDirOnZK;
- String nodeName = parentName + "/benwashere";
- try {
- zk.delete(nodeName, -1);
- } catch (KeeperException ke) {
- Code code = ke.code();
- boolean valid = code == KeeperException.Code.NONODE
- || code == KeeperException.Code.NOTEMPTY;
- if (!valid) {
- Assert.fail("Unexpected exception code for delete: " + ke.getMessage());
- }
- }
- try {
- zk.create(nodeName, null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
- } catch (KeeperException ke) {
- Code code = ke.code();
- boolean valid = code == KeeperException.Code.NODEEXISTS;
- if (!valid) {
- Assert.fail("Unexpected exception code for create: " + ke.getMessage());
- }
- }
- try {
- zk.setData(nodeName, "hi".getBytes(), 5700);
- Assert.fail("Should have gotten BadVersion exception");
- } catch (KeeperException ke) {
- if (ke.code() != Code.BADVERSION) {
- Assert.fail("Should have gotten BadVersion exception");
- }
- }
- zk.setData(nodeName, "hi".getBytes(), -1);
- Stat st = new Stat();
- byte[] bytes = zk.getData(nodeName, false, st);
- String retrieved = new String(bytes);
- if (!"hi".equals(retrieved)) {
- Assert.fail("The retrieved data [" + retrieved
- + "] is differented than the expected [hi]");
- }
- try {
- zk.delete(nodeName, 6800);
- Assert.fail("Should have gotten BadVersion exception");
- } catch (KeeperException ke) {
- Code code = ke.code();
- boolean valid = code == KeeperException.Code.NOTEMPTY
- || code == KeeperException.Code.BADVERSION;
- if (!valid) {
- Assert.fail("Unexpected exception code for delete: " + ke.getMessage());
- }
- }
- try {
- zk.delete(nodeName, -1);
- } catch (KeeperException ke) {
- Code code = ke.code();
- boolean valid = code == KeeperException.Code.NOTEMPTY;
- if (!valid) {
- Assert.fail("Unexpected exception code for delete: " + code);
- }
- }
- deleteZKDir(zk, nodeName);
- zk.close();
- }
-
- private void deleteNodeIfExists(ZooKeeper zk, String nodeName)
- throws InterruptedException {
- try {
- zk.delete(nodeName, -1);
- } catch (KeeperException ke) {
- Code code = ke.code();
- boolean valid = code == KeeperException.Code.NONODE ||
- code == KeeperException.Code.NOTEMPTY;
- if (!valid) {
- Assert.fail("Unexpected exception code for delete: " + ke.getMessage());
- }
- }
- }
-
- private void create_get_stat_test()
- throws IOException, InterruptedException, KeeperException {
- checkRoot();
- ZooKeeper zk = new ZooKeeper(hostPort, 10000, this);
- String parentName = testDirOnZK;
- String nodeName = parentName + "/create_with_stat_tmp";
- deleteNodeIfExists(zk, nodeName);
- deleteNodeIfExists(zk, nodeName + "_2");
- Stat stat = new Stat();
- zk.create(nodeName, null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT,
- stat);
- Assert.assertNotNull(stat);
- Assert.assertTrue(stat.getCzxid() > 0);
- Assert.assertTrue(stat.getCtime() > 0);
-
- Stat stat2 = new Stat();
- zk.create(nodeName + "_2", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT,
- stat2);
- Assert.assertNotNull(stat2);
- Assert.assertTrue(stat2.getCzxid() > stat.getCzxid());
- Assert.assertTrue(stat2.getCtime() > stat.getCtime());
-
- deleteNodeIfExists(zk, nodeName);
- deleteNodeIfExists(zk, nodeName + "_2");
- zk.close();
- }
-
- public void my_test_1() throws IOException,
- InterruptedException, KeeperException {
- enode_test_1();
- enode_test_2();
- delete_create_get_set_test_1();
- create_get_stat_test();
- }
-
- synchronized public void process(WatchedEvent event) {
- try {
- System.out.println("Got an event " + event.toString());
- events.put(event);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
-
- public static void main(String[] args) {
- ZooKeeperTestClient zktc = new ZooKeeperTestClient();
- try {
- zktc.my_test_1();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/check_compatibility.py
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/check_compatibility.py b/zookeeper-common/src/test/resources/check_compatibility.py
deleted file mode 100644
index cad8195..0000000
--- a/zookeeper-common/src/test/resources/check_compatibility.py
+++ /dev/null
@@ -1,204 +0,0 @@
-#!/usr/bin/env python
-#
-# 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.
-
-# Script which checks Java API compatibility between two revisions of the
-# Java client.
-#
-# Based on the compatibility checker from the HBase project, but ported to
-# Python for better readability.
-
-# Lifted from Kudu: https://github.com/apache/kudu/blob/master/build-support/check_compatibility.py
-
-import logging
-import optparse
-import os
-import shutil
-import subprocess
-import sys
-
-JAVA_ACC_GIT_URL = "https://github.com/lvc/japi-compliance-checker.git"
-
-# The annotations for what we consider our public API.
-PUBLIC_ANNOTATIONS = ["org.apache.yetus.audience.InterfaceAudience.LimitedPrivate",
- "org.apache.yetus.audience.InterfaceAudience.Public"]
-
-# Various relative paths
-PATH_TO_REPO_DIR = "../../../../"
-PATH_TO_BUILD_DIR = PATH_TO_REPO_DIR + "build/compat-check"
-PATH_TO_JACC_DIR = PATH_TO_REPO_DIR + "build/jacc"
-
-def check_output(*popenargs, **kwargs):
- # r"""Run command with arguments and return its output as a byte string.
- # Backported from Python 2.7 as it's implemented as pure python on stdlib.
- # >>> check_output(['/usr/bin/python', '--version'])
- # Python 2.6.2
- # """
- process = subprocess.Popen(stdout=subprocess.PIPE, *popenargs, **kwargs)
- output, unused_err = process.communicate()
- retcode = process.poll()
- if retcode:
- cmd = kwargs.get("args")
- if cmd is None:
- cmd = popenargs[0]
- error = subprocess.CalledProcessError(retcode, cmd)
- error.output = output
- raise error
- return output
-
-def get_repo_dir():
- """ Return the path to the top of the repo. """
- dirname, _ = os.path.split(os.path.abspath(__file__))
- return os.path.abspath(os.path.join(dirname, PATH_TO_REPO_DIR))
-
-
-def get_scratch_dir():
- """ Return the path to the scratch dir that we build within. """
- dirname, _ = os.path.split(os.path.abspath(__file__))
- return os.path.abspath(os.path.join(dirname, PATH_TO_BUILD_DIR))
-
-
-def get_java_acc_dir():
- dirname, _ = os.path.split(os.path.abspath(__file__))
- return os.path.abspath(os.path.join(dirname, PATH_TO_JACC_DIR))
-
-
-def clean_scratch_dir(scratch_dir):
- """ Clean up and re-create the scratch directory. """
- if os.path.exists(scratch_dir):
- logging.info("Removing scratch dir %s...", scratch_dir)
- shutil.rmtree(scratch_dir)
- logging.info("Creating empty scratch dir %s...", scratch_dir)
- os.makedirs(scratch_dir)
-
-
-def checkout_tree(rev, path):
- """ Check out the Java source tree for the given revision into the given path. """
- logging.info("Checking out %s in %s", rev, path)
- os.makedirs(path)
- # Extract java source
- subprocess.check_call(["bash", '-o', 'pipefail', "-c",
- ("git archive --format=tar %s | " +
- "tar -C \"%s\" -xf -") % (rev, path)],
- cwd=get_repo_dir())
-
-
-def get_git_hash(revname):
- """ Convert 'revname' to its SHA-1 hash. """
- return check_output(["git", "rev-parse", revname],
- cwd=get_repo_dir()).strip()
-
-
-def build_tree(path):
- """ Run the Java build within 'path'. """
- logging.info("Building in %s...", path)
- subprocess.check_call(["ant", "jar"], cwd=path)
-
-
-def checkout_java_acc(force):
- """
- Check out the Java API Compliance Checker. If 'force' is true, will re-download even if the
- directory exists.
- """
- acc_dir = get_java_acc_dir()
- if os.path.exists(acc_dir):
- logging.info("Java JAVA_ACC is already downloaded.")
- if not force:
- return
- logging.info("Forcing re-download.")
- shutil.rmtree(acc_dir)
- logging.info("Checking out Java JAVA_ACC...")
- subprocess.check_call(["git", "clone", "-b", "2.1", "--single-branch", "--depth=1", JAVA_ACC_GIT_URL, acc_dir])
-
-
-def find_client_jars(path):
- """ Return a list of jars within 'path' to be checked for compatibility. """
- return check_output(["find", path, "-name", "zookeeper*.jar"]).rstrip('\n')
-
-
-def run_java_acc(src_name, src, dst_name, dst):
- """ Run the compliance checker to compare 'src' and 'dst'. """
- src_jar = find_client_jars(src)
- dst_jar = find_client_jars(dst)
- logging.info("Will check compatibility between original jars:\n%s\n" +
- "and new jars:\n%s",
- src_jar, dst_jar)
-
- annotations_path = os.path.join(get_scratch_dir(), "annotations.txt")
- with file(annotations_path, "w") as f:
- for ann in PUBLIC_ANNOTATIONS:
- print >>f, ann
-
- java_acc_path = os.path.join(get_java_acc_dir(), "japi-compliance-checker.pl")
-
- out_path = os.path.join(get_scratch_dir(), "report.html")
- subprocess.check_call(["perl", java_acc_path,
- "-lib", "ZooKeeper",
- "-v1", src_name,
- "-v2", dst_name,
- "-d1", src_jar,
- "-d2", dst_jar,
- "-annotations-list", annotations_path,
- "-report-path", out_path])
-
-
-def main(argv):
- logging.basicConfig(level=logging.INFO)
- parser = optparse.OptionParser(
- usage="usage: %prog SRC..[DST]")
- parser.add_option("-f", "--force-download", dest="force_download_deps",
- help=("Download dependencies (i.e. Java JAVA_ACC) even if they are " +
- "already present"))
- opts, args = parser.parse_args()
-
- if len(args) != 1:
- parser.error("no src/dst revision specified")
- sys.exit(1)
-
- src_rev, dst_rev = args[0].split("..", 1)
- if dst_rev == "":
- dst_rev = "HEAD"
- src_rev = get_git_hash(src_rev)
- dst_rev = get_git_hash(dst_rev)
-
- logging.info("Source revision: %s", src_rev)
- logging.info("Destination revision: %s", dst_rev)
-
- # Download deps.
- checkout_java_acc(opts.force_download_deps)
-
- # Set up the build.
- scratch_dir = get_scratch_dir()
- clean_scratch_dir(scratch_dir)
-
- # Check out the src and dst source trees.
- src_dir = os.path.join(scratch_dir, "src")
- dst_dir = os.path.join(scratch_dir, "dst")
- checkout_tree(src_rev, src_dir)
- checkout_tree(dst_rev, dst_dir)
-
- # Run the build in each.
- build_tree(src_dir)
- build_tree(dst_dir)
-
- run_java_acc(src_rev, src_dir + "/build",
- dst_rev, dst_dir + "/build")
-
-
-if __name__ == "__main__":
- main(sys.argv)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/checkstyle-noframes-sorted.xsl
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/checkstyle-noframes-sorted.xsl b/zookeeper-common/src/test/resources/checkstyle-noframes-sorted.xsl
deleted file mode 100644
index 5f9e93b..0000000
--- a/zookeeper-common/src/test/resources/checkstyle-noframes-sorted.xsl
+++ /dev/null
@@ -1,178 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-<xsl:output method="html" indent="yes"/>
-<xsl:decimal-format decimal-separator="." grouping-separator="," />
-
-<xsl:key name="files" match="file" use="@name" />
-
-<!-- Checkstyle XML Style Sheet by Stephane Bailliez <sb...@apache.org> -->
-<!-- Part of the Checkstyle distribution found at http://checkstyle.sourceforge.net -->
-<!-- Usage (generates checkstyle_report.html): -->
-<!-- <checkstyle failonviolation="false" config="${check.config}"> -->
-<!-- <fileset dir="${src.dir}" includes="**/*.java"/> -->
-<!-- <formatter type="xml" toFile="${doc.dir}/checkstyle_report.xml"/> -->
-<!-- </checkstyle> -->
-<!-- <style basedir="${doc.dir}" destdir="${doc.dir}" -->
-<!-- includes="checkstyle_report.xml" -->
-<!-- style="${doc.dir}/checkstyle-noframes-sorted.xsl"/> -->
-
-<xsl:template match="checkstyle">
- <html>
- <head>
- <style type="text/css">
- .bannercell {
- border: 0px;
- padding: 0px;
- }
- body {
- margin-left: 10;
- margin-right: 10;
- font:normal 80% arial,helvetica,sanserif;
- background-color:#FFFFFF;
- color:#000000;
- }
- .a td {
- background: #efefef;
- }
- .b td {
- background: #fff;
- }
- th, td {
- text-align: left;
- vertical-align: top;
- }
- th {
- font-weight:bold;
- background: #ccc;
- color: black;
- }
- table, th, td {
- font-size:100%;
- border: none
- }
- table.log tr td, tr th {
-
- }
- h2 {
- font-weight:bold;
- font-size:140%;
- margin-bottom: 5;
- }
- h3 {
- font-size:100%;
- font-weight:bold;
- background: #525D76;
- color: white;
- text-decoration: none;
- padding: 5px;
- margin-right: 2px;
- margin-left: 2px;
- margin-bottom: 0;
- }
- </style>
- </head>
- <body>
- <a name="top"></a>
- <!-- jakarta logo -->
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
- <tr>
- <td class="bannercell" rowspan="2">
- <!--a href="http://jakarta.apache.org/">
- <img src="http://jakarta.apache.org/images/jakarta-logo.gif" alt="http://jakarta.apache.org" align="left" border="0"/>
- </a-->
- </td>
- <td class="text-align:right"><h2>CheckStyle Audit</h2></td>
- </tr>
- <tr>
- <td class="text-align:right">Designed for use with <a href='http://checkstyle.sourceforge.net/'>CheckStyle</a> and <a href='http://jakarta.apache.org'>Ant</a>.</td>
- </tr>
- </table>
- <hr size="1"/>
-
- <!-- Summary part -->
- <xsl:apply-templates select="." mode="summary"/>
- <hr size="1" width="100%" align="left"/>
-
- <!-- Package List part -->
- <xsl:apply-templates select="." mode="filelist"/>
- <hr size="1" width="100%" align="left"/>
-
- <!-- For each package create its part -->
- <xsl:apply-templates select="file[@name and generate-id(.) = generate-id(key('files', @name))]" />
-
- <hr size="1" width="100%" align="left"/>
-
-
- </body>
- </html>
-</xsl:template>
-
-
-
- <xsl:template match="checkstyle" mode="filelist">
- <h3>Files</h3>
- <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
- <tr>
- <th>Name</th>
- <th>Errors</th>
- </tr>
- <xsl:for-each select="file[@name and generate-id(.) = generate-id(key('files', @name))]">
- <xsl:sort data-type="number" order="descending" select="count(key('files', @name)/error)"/>
- <xsl:variable name="errorCount" select="count(error)"/>
- <tr>
- <xsl:call-template name="alternated-row"/>
- <td><a href="#f-{@name}"><xsl:value-of select="@name"/></a></td>
- <td><xsl:value-of select="$errorCount"/></td>
- </tr>
- </xsl:for-each>
- </table>
- </xsl:template>
-
-
- <xsl:template match="file">
- <a name="f-{@name}"></a>
- <h3>File <xsl:value-of select="@name"/></h3>
-
- <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
- <tr>
- <th>Error Description</th>
- <th>Line</th>
- </tr>
- <xsl:for-each select="key('files', @name)/error">
- <xsl:sort data-type="number" order="ascending" select="@line"/>
- <tr>
- <xsl:call-template name="alternated-row"/>
- <td><xsl:value-of select="@message"/></td>
- <td><xsl:value-of select="@line"/></td>
- </tr>
- </xsl:for-each>
- </table>
- <a href="#top">Back to top</a>
- </xsl:template>
-
-
- <xsl:template match="checkstyle" mode="summary">
- <h3>Summary</h3>
- <xsl:variable name="fileCount" select="count(file[@name and generate-id(.) = generate-id(key('files', @name))])"/>
- <xsl:variable name="errorCount" select="count(file/error)"/>
- <table class="log" border="0" cellpadding="5" cellspacing="2" width="100%">
- <tr>
- <th>Files</th>
- <th>Errors</th>
- </tr>
- <tr>
- <xsl:call-template name="alternated-row"/>
- <td><xsl:value-of select="$fileCount"/></td>
- <td><xsl:value-of select="$errorCount"/></td>
- </tr>
- </table>
- </xsl:template>
-
- <xsl:template name="alternated-row">
- <xsl:attribute name="class">
- <xsl:if test="position() mod 2 = 1">a</xsl:if>
- <xsl:if test="position() mod 2 = 0">b</xsl:if>
- </xsl:attribute>
- </xsl:template>
-</xsl:stylesheet>
-
-
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/checkstyle.xml
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/checkstyle.xml b/zookeeper-common/src/test/resources/checkstyle.xml
deleted file mode 100644
index a5d5182..0000000
--- a/zookeeper-common/src/test/resources/checkstyle.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<!--
- 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.
--->
-<!--
- [Forked from Hadoop@2d7363b27360e36fdd62546c0f9d0b1d78133f29]
-
- Checkstyle configuration for Zookeeper that is based on the sun_checks.xml file
- that is bundled with Checkstyle and includes checks for:
-
- - the Java Language Specification at
- http://java.sun.com/docs/books/jls/second_edition/html/index.html
-
- - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
-
- - the Javadoc guidelines at
- http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
-
- - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
-
- - some best practices
-
- Checkstyle is very configurable. Be sure to read the documentation at
- http://checkstyle.sf.net (or in your downloaded distribution).
-
- Most Checks are configurable, be sure to consult the documentation.
-
- To completely disable a check, just comment it out or delete it from the file.
-
- Finally, it is worth reading the documentation.
-
--->
-
-<module name="Checker">
-
- <!-- Checks that a package.html file exists for each package. -->
- <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
- <module name="JavadocPackage"/>
-
- <!-- Checks whether files end with a new line. -->
- <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
- <!-- module name="NewlineAtEndOfFile"/-->
-
- <!-- Checks that property files contain the same keys. -->
- <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
- <module name="Translation"/>
-
- <module name="FileLength"/>
- <module name="FileTabCharacter"/>
-
- <module name="TreeWalker">
-
- <!-- Checks for Javadoc comments. -->
- <!-- See http://checkstyle.sf.net/config_javadoc.html -->
- <module name="JavadocType">
- <property name="scope" value="public"/>
- <property name="allowMissingParamTags" value="true"/>
- </module>
- <module name="JavadocStyle"/>
-
- <!-- Checks for Naming Conventions. -->
- <!-- See http://checkstyle.sf.net/config_naming.html -->
- <module name="ConstantName"/>
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName"/>
- <module name="MethodName"/>
- <module name="PackageName"/>
- <module name="ParameterName"/>
- <module name="StaticVariableName"/>
- <module name="TypeName"/>
-
-
- <!-- Checks for Headers -->
- <!-- See http://checkstyle.sf.net/config_header.html -->
- <!-- <module name="Header"> -->
- <!-- The follow property value demonstrates the ability -->
- <!-- to have access to ANT properties. In this case it uses -->
- <!-- the ${basedir} property to allow Checkstyle to be run -->
- <!-- from any directory within a project. See property -->
- <!-- expansion, -->
- <!-- http://checkstyle.sf.net/config.html#properties -->
- <!-- <property -->
- <!-- name="headerFile" -->
- <!-- value="${basedir}/java.header"/> -->
- <!-- </module> -->
-
- <!-- Following interprets the header file as regular expressions. -->
- <!-- <module name="RegexpHeader"/> -->
-
-
- <!-- Checks for imports -->
- <!-- See http://checkstyle.sf.net/config_import.html -->
- <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
- <module name="RedundantImport"/>
- <module name="UnusedImports"/>
-
-
- <!-- Checks for Size Violations. -->
- <!-- See http://checkstyle.sf.net/config_sizes.html -->
- <module name="LineLength">
- <property name="ignorePattern" value="^import"/>
- </module>
- <module name="MethodLength"/>
- <module name="ParameterNumber"/>
-
-
- <!-- Checks for whitespace -->
- <!-- See http://checkstyle.sf.net/config_whitespace.html -->
- <module name="EmptyForIteratorPad"/>
- <module name="MethodParamPad"/>
- <module name="NoWhitespaceAfter"/>
- <module name="NoWhitespaceBefore"/>
- <module name="ParenPad"/>
- <module name="TypecastParenPad"/>
- <module name="WhitespaceAfter">
- <property name="tokens" value="COMMA, SEMI"/>
- </module>
-
-
- <!-- Modifier Checks -->
- <!-- See http://checkstyle.sf.net/config_modifiers.html -->
- <module name="ModifierOrder"/>
- <module name="RedundantModifier"/>
-
-
- <!-- Checks for blocks. You know, those {}'s -->
- <!-- See http://checkstyle.sf.net/config_blocks.html -->
- <module name="AvoidNestedBlocks"/>
- <module name="EmptyBlock"/>
- <module name="LeftCurly"/>
- <module name="NeedBraces"/>
- <module name="RightCurly"/>
-
-
- <!-- Checks for common coding problems -->
- <!-- See http://checkstyle.sf.net/config_coding.html -->
- <!-- module name="AvoidInlineConditionals"/-->
- <module name="EmptyStatement"/>
- <module name="EqualsHashCode"/>
- <module name="HiddenField">
- <property name="ignoreConstructorParameter" value="true"/>
- </module>
- <module name="IllegalInstantiation"/>
- <module name="InnerAssignment"/>
- <module name="MissingSwitchDefault"/>
- <module name="SimplifyBooleanExpression"/>
- <module name="SimplifyBooleanReturn"/>
-
- <!-- Checks for class design -->
- <!-- See http://checkstyle.sf.net/config_design.html -->
- <module name="FinalClass"/>
- <module name="HideUtilityClassConstructor"/>
- <module name="InterfaceIsType"/>
- <module name="VisibilityModifier"/>
-
-
- <!-- Miscellaneous other checks. -->
- <!-- See http://checkstyle.sf.net/config_misc.html -->
- <module name="ArrayTypeStyle"/>
- <module name="Indentation">
- <property name="basicOffset" value="4" />
- <property name="caseIndent" value="0" />
- </module>
- <module name="TodoComment"/>
- <module name="UpperEll"/>
-
- </module>
-
-</module>
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/buffersize/create/version-2/log.1
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/buffersize/create/version-2/log.1 b/zookeeper-common/src/test/resources/data/buffersize/create/version-2/log.1
deleted file mode 100644
index 4f05bc1..0000000
Binary files a/zookeeper-common/src/test/resources/data/buffersize/create/version-2/log.1 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/buffersize/create/version-2/snapshot.0
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/buffersize/create/version-2/snapshot.0 b/zookeeper-common/src/test/resources/data/buffersize/create/version-2/snapshot.0
deleted file mode 100644
index 49b512e..0000000
Binary files a/zookeeper-common/src/test/resources/data/buffersize/create/version-2/snapshot.0 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/buffersize/set/version-2/log.1
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/buffersize/set/version-2/log.1 b/zookeeper-common/src/test/resources/data/buffersize/set/version-2/log.1
deleted file mode 100644
index 8586f16..0000000
Binary files a/zookeeper-common/src/test/resources/data/buffersize/set/version-2/log.1 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/buffersize/set/version-2/snapshot.0
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/buffersize/set/version-2/snapshot.0 b/zookeeper-common/src/test/resources/data/buffersize/set/version-2/snapshot.0
deleted file mode 100644
index 49b512e..0000000
Binary files a/zookeeper-common/src/test/resources/data/buffersize/set/version-2/snapshot.0 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/buffersize/snapshot/version-2/log.1
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/buffersize/snapshot/version-2/log.1 b/zookeeper-common/src/test/resources/data/buffersize/snapshot/version-2/log.1
deleted file mode 100644
index 2f145a6..0000000
Binary files a/zookeeper-common/src/test/resources/data/buffersize/snapshot/version-2/log.1 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/buffersize/snapshot/version-2/snapshot.0
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/buffersize/snapshot/version-2/snapshot.0 b/zookeeper-common/src/test/resources/data/buffersize/snapshot/version-2/snapshot.0
deleted file mode 100644
index 49b512e..0000000
Binary files a/zookeeper-common/src/test/resources/data/buffersize/snapshot/version-2/snapshot.0 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/buffersize/snapshot/version-2/snapshot.2
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/buffersize/snapshot/version-2/snapshot.2 b/zookeeper-common/src/test/resources/data/buffersize/snapshot/version-2/snapshot.2
deleted file mode 100644
index 59dfa70..0000000
Binary files a/zookeeper-common/src/test/resources/data/buffersize/snapshot/version-2/snapshot.2 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.1
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.1 b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.1
deleted file mode 100644
index 9dc15ae..0000000
Binary files a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.1 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.274
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.274 b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.274
deleted file mode 100644
index 3bb868e..0000000
Binary files a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.274 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.42
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.42 b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.42
deleted file mode 100644
index 5385be5..0000000
Binary files a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.42 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.63b
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.63b b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.63b
deleted file mode 100644
index 4ee0a98..0000000
Binary files a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.63b and /dev/null differ
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.0
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.0 b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.0
deleted file mode 100644
index 49b512e..0000000
Binary files a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.0 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.272
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.272 b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.272
deleted file mode 100644
index 71f32a5..0000000
Binary files a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.272 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.273
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.273 b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.273
deleted file mode 100644
index 3146f56..0000000
Binary files a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.273 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.639
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.639 b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.639
deleted file mode 100644
index cf9e389..0000000
Binary files a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.639 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.83f
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.83f b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.83f
deleted file mode 100644
index 26dc5f6..0000000
Binary files a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.83f and /dev/null differ
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/kerberos/minikdc-krb5.conf
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/kerberos/minikdc-krb5.conf b/zookeeper-common/src/test/resources/data/kerberos/minikdc-krb5.conf
deleted file mode 100644
index 43ec7c4..0000000
--- a/zookeeper-common/src/test/resources/data/kerberos/minikdc-krb5.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# 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.
-#
-# This resource is originally from HDFS, see the similarly named files there
-# in case of bug fixing, history, etc.
-# Branch : trunk
-# Github Revision: 1d1ab587e4e92ce3aea4cb144811f69145cb3b33
-#
-[libdefaults]
- default_realm = {0}
- udp_preference_limit = 1
-
-[realms]
- {0} = '{'
- kdc = {1}:{2}
- '}'
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/kerberos/minikdc.ldiff
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/kerberos/minikdc.ldiff b/zookeeper-common/src/test/resources/data/kerberos/minikdc.ldiff
deleted file mode 100644
index 20c8d77..0000000
--- a/zookeeper-common/src/test/resources/data/kerberos/minikdc.ldiff
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# 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.
-#
-# This resource is originally from HDFS, see the similarly named files there
-# in case of bug fixing, history, etc.
-# Branch : trunk
-# Github Revision: 1d1ab587e4e92ce3aea4cb144811f69145cb3b33
-#
-dn: ou=users,dc=${0},dc=${1}
-objectClass: organizationalUnit
-objectClass: top
-ou: users
-
-dn: uid=krbtgt,ou=users,dc=${0},dc=${1}
-objectClass: top
-objectClass: person
-objectClass: inetOrgPerson
-objectClass: krb5principal
-objectClass: krb5kdcentry
-cn: KDC Service
-sn: Service
-uid: krbtgt
-userPassword: secret
-krb5PrincipalName: krbtgt/${2}.${3}@${2}.${3}
-krb5KeyVersionNumber: 0
-
-dn: uid=ldap,ou=users,dc=${0},dc=${1}
-objectClass: top
-objectClass: person
-objectClass: inetOrgPerson
-objectClass: krb5principal
-objectClass: krb5kdcentry
-cn: LDAP
-sn: Service
-uid: ldap
-userPassword: secret
-krb5PrincipalName: ldap/${4}@${2}.${3}
-krb5KeyVersionNumber: 0
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/ssl/README.md
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/ssl/README.md b/zookeeper-common/src/test/resources/data/ssl/README.md
deleted file mode 100644
index b8823d8..0000000
--- a/zookeeper-common/src/test/resources/data/ssl/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-SSL test data
-===================
-
-testKeyStore.jks
----
-Testing keystore, password is "testpass".
-
-testTrustStore.jks
----
-Testing truststore, password is "testpass".
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/ssl/testKeyStore.jks
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/ssl/testKeyStore.jks b/zookeeper-common/src/test/resources/data/ssl/testKeyStore.jks
deleted file mode 100644
index 40a7d0b..0000000
Binary files a/zookeeper-common/src/test/resources/data/ssl/testKeyStore.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/ssl/testTrustStore.jks
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/ssl/testTrustStore.jks b/zookeeper-common/src/test/resources/data/ssl/testTrustStore.jks
deleted file mode 100644
index 33f09c1..0000000
Binary files a/zookeeper-common/src/test/resources/data/ssl/testTrustStore.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/upgrade/log.100000001
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/upgrade/log.100000001 b/zookeeper-common/src/test/resources/data/upgrade/log.100000001
deleted file mode 100644
index 00655f1..0000000
Binary files a/zookeeper-common/src/test/resources/data/upgrade/log.100000001 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/upgrade/log.100001bf0
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/upgrade/log.100001bf0 b/zookeeper-common/src/test/resources/data/upgrade/log.100001bf0
deleted file mode 100644
index 83fa697..0000000
Binary files a/zookeeper-common/src/test/resources/data/upgrade/log.100001bf0 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/upgrade/snapshot.100000000
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/upgrade/snapshot.100000000 b/zookeeper-common/src/test/resources/data/upgrade/snapshot.100000000
deleted file mode 100644
index 56f9015..0000000
Binary files a/zookeeper-common/src/test/resources/data/upgrade/snapshot.100000000 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/data/upgrade/snapshot.100001bec
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/data/upgrade/snapshot.100001bec b/zookeeper-common/src/test/resources/data/upgrade/snapshot.100001bec
deleted file mode 100644
index 0010d1e..0000000
Binary files a/zookeeper-common/src/test/resources/data/upgrade/snapshot.100001bec and /dev/null differ
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/findbugsExcludeFile.xml
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/findbugsExcludeFile.xml b/zookeeper-common/src/test/resources/findbugsExcludeFile.xml
deleted file mode 100644
index a3f45a6..0000000
--- a/zookeeper-common/src/test/resources/findbugsExcludeFile.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<FindBugsFilter>
- <!-- Allow command line utilities, which follow pattern *Main.java, to call
- system exit -->
- <Match>
- <Class name="~org\.apache\.zookeeper\..*Main" />
- <Bug pattern="DM_EXIT" />
- </Match>
-
- <!-- This is too complicated to resolve/ingrained into the architecture
- In particular we want to make sure we exit if this occurs
- Also notice logged as fatal error -->
- <Match>
- <Class name="org.apache.zookeeper.server.ZooKeeperCriticalThread" />
- <Method name="handleException" />
- <Bug pattern="DM_EXIT" />
- </Match>
-
- <!-- In particular we want to make sure we exit if this occurs, unrecoverable.
- Also notice logged as fatal error -->
- <Match>
- <Class name="org.apache.zookeeper.server.ZooKeeperServer" />
- <Method name="takeSnapshot" />
- <Bug pattern="DM_EXIT" />
- </Match>
-
-
- <!-- We want to catch all exceptions and cleanup, regardless of source
- (incl runtime) -->
- <Match>
- <Class name="org.apache.zookeeper.ClientCnxn$SendThread" />
- <Method name="run" />
- <Bug pattern="REC_CATCH_EXCEPTION" />
- </Match>
-
- <!-- Committing out of order is an unrecoverable error, so we should
- really exit -->
- <Match>
- <Class name="org.apache.zookeeper.server.quorum.FollowerZooKeeperServer" />
- <Method name="commit" />
- <Bug pattern="DM_EXIT" />
- </Match>
-
- <!-- Two unrecoverable errors while following the leader -->
- <Match>
- <Class name="org.apache.zookeeper.server.quorum.Learner" />
- <Method name="syncWithLeader" />
- <Bug pattern="DM_EXIT" />
- </Match>
-
- <!-- QuorumCnxManager Listener thread fails to bind election port -->
- <Match>
- <Class name="org.apache.zookeeper.server.quorum.QuorumCnxManager$Listener"/>
- <Method name="run" />
- <Bug pattern="DM_EXIT" />
- </Match>
-
- <!-- Failed to create watch manager is a unrecoverable error -->
- <Match>
- <Class name="org.apache.zookeeper.server.DataTree" />
- <Bug pattern="DM_EXIT" />
- </Match>
-
- <Match>
- <Package name="org.apache.jute.compiler.generated" />
- </Match>
-
- <Match>
- <Package name="~org\.apache\.zookeeper\.(proto|data|txn)" />
- <Bug code="EI, EI2" />
- </Match>
-
- <Match>
- <Class name="org.apache.zookeeper.server.DataNode" />
- <Bug code="EI2"/>
- </Match>
-
- <Match>
- <Class name="org.apache.zookeeper.server.quorum.QuorumPacket" />
- <Bug code="EI2, EI" />
- </Match>
-
- <Match>
- <Class name="org.apache.zookeeper.server.quorum.QuorumAuthPacket" />
- <Bug code="EI2, EI" />
- </Match>
-
- <Match>
- <Class name="org.apache.zookeeper.ClientCnxn"/>
- <Bug code="EI, EI2" />
- </Match>
-
- <Match>
- <Class name="org.apache.zookeeper.server.DataNode"/>
- <Field name="children"/>
- <Bug code="IS"/>
- </Match>
- <Match>
- <Class name="org.apache.zookeeper.server.quorum.Leader"/>
- <Field name="lastProposed"/>
- <Bug code="IS"/>
- </Match>
- <Match>
- <Class name="org.apache.zookeeper.server.persistence.FileTxnLog"/>
- <Field name="serverStats"/>
- <Bug code="IS"/>
- </Match>
-
- <!-- The iterate function is non-thread safe, the caller will synchronize
- on the BitHHashSet object -->
- <Match>
- <Class name="org.apache.zookeeper.server.util.BitHashSet" />
- <Field name="elementCount" />
- <Bug code="IS" />
- </Match>
-
- <Match>
- <Class name="org.apache.zookeeper.server.quorum.LearnerSessionTracker"/>
- <Bug code="UrF"/>
- </Match>
- <Match>
- <Class name="org.apache.zookeeper.server.quorum.AuthFastLeaderElection$Messenger$WorkerSender"/>
- <Method name="process"/>
- <Bug code="RV"/>
- </Match>
-
- <!-- these are old classes just for upgrading and should go away -->
- <Match>
- <Class name="org.apache.zookeeper.server.upgrade.DataNodeV1"/>
- </Match>
-
- <Match>
- <Class name="org.apache.zookeeper.server.upgrade.DataTreeV1"/>
- </Match>
-
- <!-- References code in a generated file that may or maynot be null -->
- <Match>
- <Class name="org.apache.zookeeper.Version" />
- <Method name="getVersion" />
- <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NULL_VALUE" />
- </Match>
-
- <!-- sync'd object is also being used to protect the isrunning flag, this is ok -->
- <Match>
- <Class name="org.apache.zookeeper.ClientCnxn$EventThread"/>
- <Bug code="JLM"/>
- <Or>
- <Method name="queuePacket" />
- <Method name="run" />
- </Or>
- </Match>
-
- <!-- Synchronize on the AtomicInteger to do wait/notify, but not relying
- on the synchronization to control the AtomicInteger value update,
- so it's not a problem -->
- <Match>
- <Class name="org.apache.zookeeper.server.watch.WatcherCleaner" />
- <Bug code="JLM" />
- <Method name="addDeadWatcher" />
- </Match>
-
- <Match>
- <Class name="org.apache.zookeeper.server.watch.WatcherCleaner$1" />
- <Bug code="JLM" />
- <Method name="doWork" />
- </Match>
-
-
-
- <Match>
- <Class name="org.apache.zookeeper.server.quorum.QuorumPeer"/>
- <Bug pattern="OS_OPEN_STREAM" />
- <Method name="writeLongToFile" />
- </Match>
-
- <!-- this is a helper routine to wakeup the main thread with the
- state change happening in the routines that call it -->
- <Match>
- <Class name="org.apache.zookeeper.server.quorum.CommitProcessor"/>
- <Bug pattern="NN_NAKED_NOTIFY" />
- <Method name="wakeup" />
- </Match>
-
- <!-- Disable encoding warnings -->
- <Match>
- <Bug pattern="DM_DEFAULT_ENCODING" />
- </Match>
-
- <!-- Disable 'Malicious code vulnerability warnings' due to mutable collection types in interface.
- Undo this when ZOOKEEPER-1362 is done. -->
- <Match>
- <Class name="org.apache.zookeeper.ZooDefs$Ids"/>
- <Bug pattern="MS_MUTABLE_COLLECTION" />
- </Match>
-
- <!-- Disable 'Return value of method without side effect is ignored' for EphemeralType. The default
- version just returns 0 which triggers the warning. Findbugs can't seem to find the override in
- the TTL value of the enum however -->
- <Match>
- <Class name="org.apache.zookeeper.server.EphemeralType"/>
- <Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT" />
- </Match>
-</FindBugsFilter>
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/test-github-pr.sh
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/test-github-pr.sh b/zookeeper-common/src/test/resources/test-github-pr.sh
deleted file mode 100755
index e155769..0000000
--- a/zookeeper-common/src/test/resources/test-github-pr.sh
+++ /dev/null
@@ -1,616 +0,0 @@
-#!/usr/bin/env bash
-# Licensed 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.
-
-
-#set -x
-
-### Setup some variables.
-### GIT_COMMIT and BUILD_URL are set by Hudson if it is run by patch process
-### Read variables from properties file
-. `dirname $0`/test-patch.properties
-
-###############################################################################
-parseArgs() {
- case "$1" in
- QABUILD)
- ### Set QABUILD to true to indicate that this script is being run by Hudson
- QABUILD=true
- if [[ $# != 14 ]] ; then
- echo "ERROR: usage $0 QABUILD <PATCH_DIR> <PS_CMD> <WGET_CMD> <JIRACLI> <GIT_CMD> <GREP_CMD> <PATCH_CMD> <FINDBUGS_HOME> <FORREST_HOME> <WORKSPACE_BASEDIR> <JIRA_PASSWD> <JAVA5_HOME> <CURL_CMD>"
- cleanupAndExit 0
- fi
- PATCH_DIR=$2
- PS=$3
- WGET=$4
- JIRACLI=$5
- GIT=$6
- GREP=$7
- PATCH=$8
- FINDBUGS_HOME=$9
- FORREST_HOME=${10}
- BASEDIR=${11}
- JIRA_PASSWD=${12}
- JAVA5_HOME=${13}
- CURL=${14}
- if [ ! -e "$PATCH_DIR" ] ; then
- mkdir -p $PATCH_DIR
- fi
-
- ## Obtain PR number and title
- PULLREQUEST_ID=${GIT_PR_NUMBER}
- PULLREQUEST_TITLE="${GIT_PR_TITLE}"
-
- ## Extract jira number from PR title
- local prefix=${PULLREQUEST_TITLE%ZOOKEEPER\-[0-9]*}
- local noprefix=${PULLREQUEST_TITLE#$prefix}
- local regex='\(ZOOKEEPER-.[0-9]*\)'
- defect=$(expr "$noprefix" : ${regex})
-
- echo "Pull request id: ${PULLREQUEST_ID}"
- echo "Pull request title: ${PULLREQUEST_TITLE}"
- echo "Defect number: ${defect}"
-
- JIRA_COMMENT="GitHub Pull Request ${PULLREQUEST_NUMBER} Build
- "
- ;;
- DEVELOPER)
- ### Set QABUILD to false to indicate that this script is being run by a developer
- QABUILD=false
- if [[ $# != 10 ]] ; then
- echo "ERROR: usage $0 DEVELOPER <GIT_PR_URL> <SCRATCH_DIR> <GIT_CMD> <GREP_CMD> <PATCH_CMD> <FINDBUGS_HOME> <FORREST_HOME> <WORKSPACE_BASEDIR> <JAVA5_HOME>"
- cleanupAndExit 0
- fi
- PATCH_DIR=$3
- PATCH_FILE=${PATCH_DIR}/patch
- curl -L $2.diff > ${PATCH_FILE}
- ### PATCH_FILE contains the location of the patchfile
- if [[ ! -e "$PATCH_FILE" ]] ; then
- echo "Unable to locate the patch file $PATCH_FILE"
- cleanupAndExit 0
- fi
- ### Check if $PATCH_DIR exists. If it does not exist, create a new directory
- if [[ ! -e "$PATCH_DIR" ]] ; then
- mkdir "$PATCH_DIR"
- if [[ $? == 0 ]] ; then
- echo "$PATCH_DIR has been created"
- else
- echo "Unable to create $PATCH_DIR"
- cleanupAndExit 0
- fi
- fi
- GIT=$4
- GREP=$5
- PATCH=$6
- FINDBUGS_HOME=$7
- FORREST_HOME=$8
- BASEDIR=$9
- JAVA5_HOME=${10}
- ### Obtain the patch filename to append it to the version number
- local subject=`grep "Subject:" ${PATCH_FILE}`
- local length=`expr match ${subject} ZOOKEEPER-[0-9]*`
- local position=`expr index ${subject} ZOOKEEPER-`
- defect=${${subject:$position:$length}#ZOOKEEPER-}
- ;;
- *)
- echo "ERROR: usage $0 QABUILD [args] | DEVELOPER [args]"
- cleanupAndExit 0
- ;;
- esac
-}
-
-###############################################################################
-checkout () {
- echo ""
- echo ""
- echo "======================================================================"
- echo "======================================================================"
- echo " Testing patch for pull request ${PULLREQUEST_ID}."
- echo "======================================================================"
- echo "======================================================================"
- echo ""
- echo ""
- ### When run by a developer, if the workspace contains modifications, do not continue
- # Ref http://stackoverflow.com/a/2659808 for details on checking dirty status
- ${GIT} diff-index --quiet HEAD
- if [[ $? -ne 0 ]] ; then
- uncommitted=`${GIT} diff --name-only HEAD`
- uncommitted="You have the following files with uncommitted changes:${NEWLINE}${uncommitted}"
- fi
- untracked="$(${GIT} ls-files --exclude-standard --others)" && test -z "${untracked}"
- if [[ $? -ne 0 ]] ; then
- untracked="You have untracked and unignored files:${NEWLINE}${untracked}"
- fi
-
- if [[ $QABUILD == "false" ]] ; then
- if [[ $uncommitted || $untracked ]] ; then
- echo "ERROR: can't run in a workspace that contains the following modifications"
- echo ""
- echo "${uncommitted}"
- echo ""
- echo "${untracked}"
- cleanupAndExit 1
- fi
- else
- # I don't believe we need to do anything here - the jenkins job will
- # cleanup the environment for us ("cleanup before checkout" action)
- # on the precommit jenkins job
- echo
- fi
- return $?
-}
-
-###############################################################################
-setup () {
- ### exit if warnings are NOT defined in the properties file
- if [ -z "$OK_FINDBUGS_WARNINGS" ] || [[ -z "$OK_JAVADOC_WARNINGS" ]] || [[ -z $OK_RELEASEAUDIT_WARNINGS ]]; then
- echo "Please define the following properties in test-patch.properties file"
- echo "OK_FINDBUGS_WARNINGS"
- echo "OK_RELEASEAUDIT_WARNINGS"
- echo "OK_JAVADOC_WARNINGS"
- cleanupAndExit 1
- fi
- ### get pull request diff
- ${CURL} -L ${GIT_PR_URL}.diff > $PATCH_DIR/patch
-
- echo ""
- echo ""
- echo "======================================================================"
- echo "======================================================================"
- echo " Pre-build trunk to verify trunk stability and javac warnings"
- echo "======================================================================"
- echo "======================================================================"
- echo ""
- echo ""
- echo "$ANT_HOME/bin/ant -Djavac.args="-Xlint -Xmaxwarns 1000" -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DZookeeperPatchProcess= clean tar > $PATCH_DIR/trunkJavacWarnings.txt 2>&1"
- $ANT_HOME/bin/ant -Djavac.args="-Xlint -Xmaxwarns 1000" -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DZookeeperPatchProcess= clean tar > $PATCH_DIR/trunkJavacWarnings.txt 2>&1
- if [[ $? != 0 ]] ; then
- echo "Trunk compilation is broken?"
- cleanupAndExit 1
- fi
-}
-
-###############################################################################
-### Check for @author tags in the patch
-checkAuthor () {
- echo ""
- echo ""
- echo "======================================================================"
- echo "======================================================================"
- echo " Checking there are no @author tags in the patch."
- echo "======================================================================"
- echo "======================================================================"
- echo ""
- echo ""
- authorTags=`$GREP -c -i '@author' $PATCH_DIR/patch`
- echo "There appear to be $authorTags @author tags in the patch."
- if [[ $authorTags != 0 ]] ; then
- JIRA_COMMENT="$JIRA_COMMENT
-
- -1 @author. The patch appears to contain $authorTags @author tags which the Zookeeper community has agreed to not allow in code contributions."
- return 1
- fi
- JIRA_COMMENT="$JIRA_COMMENT
-
- +1 @author. The patch does not contain any @author tags."
- return 0
-}
-
-###############################################################################
-### Check for tests in the patch
-checkTests () {
- echo ""
- echo ""
- echo "======================================================================"
- echo "======================================================================"
- echo " Checking there are new or changed tests in the patch."
- echo "======================================================================"
- echo "======================================================================"
- echo ""
- echo ""
- testReferences=`$GREP -c -i '/test' $PATCH_DIR/patch`
- echo "There appear to be $testReferences test files referenced in the patch."
- if [[ $testReferences == 0 ]] ; then
- if [[ $QABUILD == "true" ]] ; then
- patchIsDoc=`$GREP -c -i 'title="documentation' $PATCH_DIR/jira`
- if [[ $patchIsDoc != 0 ]] ; then
- echo "The patch appears to be a documentation patch that doesn't require tests."
- JIRA_COMMENT="$JIRA_COMMENT
-
- +0 tests included. The patch appears to be a documentation patch that doesn't require tests."
- return 0
- fi
- fi
- JIRA_COMMENT="$JIRA_COMMENT
-
- -1 tests included. The patch doesn't appear to include any new or modified tests.
- Please justify why no new tests are needed for this patch.
- Also please list what manual steps were performed to verify this patch."
- return 1
- fi
- JIRA_COMMENT="$JIRA_COMMENT
-
- +1 tests included. The patch appears to include $testReferences new or modified tests."
- return 0
-}
-
-###############################################################################
-### Check there are no javadoc warnings
-checkJavadocWarnings () {
- echo ""
- echo ""
- echo "======================================================================"
- echo "======================================================================"
- echo " Determining number of patched javadoc warnings."
- echo "======================================================================"
- echo "======================================================================"
- echo ""
- echo ""
- echo "$ANT_HOME/bin/ant -DZookeeperPatchProcess= clean javadoc | tee $PATCH_DIR/patchJavadocWarnings.txt"
- $ANT_HOME/bin/ant -DZookeeperPatchProcess= clean javadoc | tee $PATCH_DIR/patchJavadocWarnings.txt
- javadocWarnings=`$GREP -o '\[javadoc\] [0-9]* warning' $PATCH_DIR/patchJavadocWarnings.txt | awk '{total += $2} END {print total}'`
- echo ""
- echo ""
- echo "There appear to be $javadocWarnings javadoc warnings generated by the patched build."
-
- ### if current warnings greater than OK_JAVADOC_WARNINGS
- if [[ $javadocWarnings > $OK_JAVADOC_WARNINGS ]] ; then
- JIRA_COMMENT="$JIRA_COMMENT
-
- -1 javadoc. The javadoc tool appears to have generated `expr $(($javadocWarnings-$OK_JAVADOC_WARNINGS))` warning messages."
- return 1
- fi
- JIRA_COMMENT="$JIRA_COMMENT
-
- +1 javadoc. The javadoc tool did not generate any warning messages."
- return 0
-}
-
-###############################################################################
-### Check there are no changes in the number of Javac warnings
-checkJavacWarnings () {
- echo ""
- echo ""
- echo "======================================================================"
- echo "======================================================================"
- echo " Determining number of patched javac warnings."
- echo "======================================================================"
- echo "======================================================================"
- echo ""
- echo ""
- echo "$ANT_HOME/bin/ant -Djavac.args="-Xlint -Xmaxwarns 1000" -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DZookeeperPatchProcess= clean tar > $PATCH_DIR/patchJavacWarnings.txt 2>&1"
- $ANT_HOME/bin/ant -Djavac.args="-Xlint -Xmaxwarns 1000" -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DZookeeperPatchProcess= clean tar > $PATCH_DIR/patchJavacWarnings.txt 2>&1
- if [[ $? != 0 ]] ; then
- JIRA_COMMENT="$JIRA_COMMENT
-
- -1 javac. The patch appears to cause tar ant target to fail."
- return 1
- fi
- ### Compare trunk and patch javac warning numbers
- if [[ -f $PATCH_DIR/patchJavacWarnings.txt ]] ; then
- trunkJavacWarnings=`$GREP -o '\[javac\] [0-9]* warning' $PATCH_DIR/trunkJavacWarnings.txt | awk '{total += $2} END {print total}'`
- patchJavacWarnings=`$GREP -o '\[javac\] [0-9]* warning' $PATCH_DIR/patchJavacWarnings.txt | awk '{total += $2} END {print total}'`
- echo "There appear to be $trunkJavacWarnings javac compiler warnings before the patch and $patchJavacWarnings javac compiler warnings after applying the patch."
- if [[ $patchJavacWarnings != "" && $trunkJavacWarnings != "" ]] ; then
- if [[ $patchJavacWarnings -gt $trunkJavacWarnings ]] ; then
- JIRA_COMMENT="$JIRA_COMMENT
-
- -1 javac. The applied patch generated $patchJavacWarnings javac compiler warnings (more than the trunk's current $trunkJavacWarnings warnings)."
- return 1
- fi
- fi
- fi
- JIRA_COMMENT="$JIRA_COMMENT
-
- +1 javac. The applied patch does not increase the total number of javac compiler warnings."
- return 0
-}
-
-###############################################################################
-### Check there are no changes in the number of release audit (RAT) warnings
-checkReleaseAuditWarnings () {
- echo ""
- echo ""
- echo "======================================================================"
- echo "======================================================================"
- echo " Determining number of patched release audit warnings."
- echo "======================================================================"
- echo "======================================================================"
- echo ""
- echo ""
- echo "$ANT_HOME/bin/ant -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DZookeeperPatchProcess= releaseaudit > $PATCH_DIR/patchReleaseAuditWarnings.txt 2>&1"
- $ANT_HOME/bin/ant -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DZookeeperPatchProcess= releaseaudit > $PATCH_DIR/patchReleaseAuditWarnings.txt 2>&1
-
- ### Compare trunk and patch release audit warning numbers
- if [[ -f $PATCH_DIR/patchReleaseAuditWarnings.txt ]] ; then
- patchReleaseAuditWarnings=`$GREP -c '\!?????' $PATCH_DIR/patchReleaseAuditWarnings.txt`
- echo ""
- echo ""
- echo "There appear to be $OK_RELEASEAUDIT_WARNINGS release audit warnings before the patch and $patchReleaseAuditWarnings release audit warnings after applying the patch."
- if [[ $patchReleaseAuditWarnings != "" && $OK_RELEASEAUDIT_WARNINGS != "" ]] ; then
- if [[ $patchReleaseAuditWarnings -gt $OK_RELEASEAUDIT_WARNINGS ]] ; then
- JIRA_COMMENT="$JIRA_COMMENT
-
- -1 release audit. The applied patch generated $patchReleaseAuditWarnings release audit warnings (more than the trunk's current $OK_RELEASEAUDIT_WARNINGS warnings)."
- $GREP '\!?????' $PATCH_DIR/patchReleaseAuditWarnings.txt > $PATCH_DIR/patchReleaseAuditProblems.txt
- echo "Lines that start with ????? in the release audit report indicate files that do not have an Apache license header." >> $PATCH_DIR/patchReleaseAuditProblems.txt
- JIRA_COMMENT_FOOTER="Release audit warnings: $BUILD_URL/artifact/trunk/patchprocess/patchReleaseAuditProblems.txt
-$JIRA_COMMENT_FOOTER"
- return 1
- fi
- fi
- fi
- JIRA_COMMENT="$JIRA_COMMENT
-
- +1 release audit. The applied patch does not increase the total number of release audit warnings."
- return 0
-}
-
-###############################################################################
-### Check there are no changes in the number of Checkstyle warnings
-checkStyle () {
- echo ""
- echo ""
- echo "======================================================================"
- echo "======================================================================"
- echo " Determining number of patched checkstyle warnings."
- echo "======================================================================"
- echo "======================================================================"
- echo ""
- echo ""
- echo "THIS IS NOT IMPLEMENTED YET"
- echo ""
- echo ""
- echo "$ANT_HOME/bin/ant -DZookeeperPatchProcess= checkstyle"
- $ANT_HOME/bin/ant -DZookeeperPatchProcess= checkstyle
- JIRA_COMMENT_FOOTER="Checkstyle results: $BUILD_URL/artifact/trunk/build/test/checkstyle-errors.html
-$JIRA_COMMENT_FOOTER"
- ### TODO: calculate actual patchStyleErrors
-# patchStyleErrors=0
-# if [[ $patchStyleErrors != 0 ]] ; then
-# JIRA_COMMENT="$JIRA_COMMENT
-#
-# -1 checkstyle. The patch generated $patchStyleErrors code style errors."
-# return 1
-# fi
-# JIRA_COMMENT="$JIRA_COMMENT
-#
-# +1 checkstyle. The patch generated 0 code style errors."
- return 0
-}
-
-###############################################################################
-### Check there are no changes in the number of Findbugs warnings
-checkFindbugsWarnings () {
- findbugs_version=`${FINDBUGS_HOME}/bin/findbugs -version`
- echo ""
- echo ""
- echo "======================================================================"
- echo "======================================================================"
- echo " Determining number of patched Findbugs warnings."
- echo "======================================================================"
- echo "======================================================================"
- echo ""
- echo ""
- echo "$ANT_HOME/bin/ant -Dfindbugs.home=$FINDBUGS_HOME -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DZookeeperPatchProcess= findbugs"
- $ANT_HOME/bin/ant -Dfindbugs.home=$FINDBUGS_HOME -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -DZookeeperPatchProcess= findbugs
- if [ $? != 0 ] ; then
- JIRA_COMMENT="$JIRA_COMMENT
-
- -1 findbugs. The patch appears to cause Findbugs (version ${findbugs_version}) to fail."
- return 1
- fi
-JIRA_COMMENT_FOOTER="Findbugs warnings: $BUILD_URL/artifact/trunk/build/test/findbugs/newPatchFindbugsWarnings.html
-$JIRA_COMMENT_FOOTER"
- cp $BASEDIR/build/test/findbugs/*.xml $PATCH_DIR/patchFindbugsWarnings.xml
- $FINDBUGS_HOME/bin/setBugDatabaseInfo -timestamp "01/01/2000" \
- $PATCH_DIR/patchFindbugsWarnings.xml \
- $PATCH_DIR/patchFindbugsWarnings.xml
- findbugsWarnings=`$FINDBUGS_HOME/bin/filterBugs -first "01/01/2000" $PATCH_DIR/patchFindbugsWarnings.xml \
- $BASEDIR/build/test/findbugs/newPatchFindbugsWarnings.xml | /usr/bin/awk '{print $1}'`
- $FINDBUGS_HOME/bin/convertXmlToText -html \
- $BASEDIR/build/test/findbugs/newPatchFindbugsWarnings.xml \
- $BASEDIR/build/test/findbugs/newPatchFindbugsWarnings.html
- cp $BASEDIR/build/test/findbugs/newPatchFindbugsWarnings.html $PATCH_DIR/newPatchFindbugsWarnings.html
- cp $BASEDIR/build/test/findbugs/newPatchFindbugsWarnings.xml $PATCH_DIR/newPatchFindbugsWarnings.xml
-
- ### if current warnings greater than OK_FINDBUGS_WARNINGS
- if [[ $findbugsWarnings > $OK_FINDBUGS_WARNINGS ]] ; then
- JIRA_COMMENT="$JIRA_COMMENT
-
- -1 findbugs. The patch appears to introduce `expr $(($findbugsWarnings-$OK_FINDBUGS_WARNINGS))` new Findbugs (version ${findbugs_version}) warnings."
- return 1
- fi
- JIRA_COMMENT="$JIRA_COMMENT
-
- +1 findbugs. The patch does not introduce any new Findbugs (version ${findbugs_version}) warnings."
- return 0
-}
-
-###############################################################################
-### Run the test-core target
-runCoreTests () {
- echo ""
- echo ""
- echo "======================================================================"
- echo "======================================================================"
- echo " Running core tests."
- echo "======================================================================"
- echo "======================================================================"
- echo ""
- echo ""
-
- ### Kill any rogue build processes from the last attempt
- $PS auxwww | $GREP ZookeeperPatchProcess | /usr/bin/nawk '{print $2}' | /usr/bin/xargs -t -I {} /bin/kill -9 {} > /dev/null
-
- echo "$ANT_HOME/bin/ant -DZookeeperPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes -Dtest.junit.threads=8 -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME test-core"
- $ANT_HOME/bin/ant -DZookeeperPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes -Dtest.junit.threads=8 -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME -Djava5.home=$JAVA5_HOME test-core
- if [[ $? != 0 ]] ; then
- JIRA_COMMENT="$JIRA_COMMENT
-
- -1 core tests. The patch failed core unit tests."
- return 1
- fi
- JIRA_COMMENT="$JIRA_COMMENT
-
- +1 core tests. The patch passed core unit tests."
- return 0
-}
-
-###############################################################################
-### Run the test-contrib target
-runContribTests () {
- echo ""
- echo ""
- echo "======================================================================"
- echo "======================================================================"
- echo " Running contrib tests."
- echo "======================================================================"
- echo "======================================================================"
- echo ""
- echo ""
-
- ### Kill any rogue build processes from the last attempt
- $PS auxwww | $GREP ZookeeperPatchProcess | /usr/bin/nawk '{print $2}' | /usr/bin/xargs -t -I {} /bin/kill -9 {} > /dev/null
-
- echo "$ANT_HOME/bin/ant -DZookeeperPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes test-contrib"
- $ANT_HOME/bin/ant -DZookeeperPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=yes test-contrib
- if [[ $? != 0 ]] ; then
- JIRA_COMMENT="$JIRA_COMMENT
-
- -1 contrib tests. The patch failed contrib unit tests."
- return 1
- fi
- JIRA_COMMENT="$JIRA_COMMENT
-
- +1 contrib tests. The patch passed contrib unit tests."
- return 0
-}
-
-###############################################################################
-### Submit a comment to the defect's Jira
-submitJiraComment () {
- local result=$1
- ### Do not output the value of JIRA_COMMENT_FOOTER when run by a developer
- if [[ $QABUILD == "false" ]] ; then
- JIRA_COMMENT_FOOTER=""
- fi
- if [[ $result == 0 ]] ; then
- comment="+1 overall. $JIRA_COMMENT
-
-$JIRA_COMMENT_FOOTER"
- else
- comment="-1 overall. $JIRA_COMMENT
-
-$JIRA_COMMENT_FOOTER"
- fi
- ### Output the test result to the console
- echo "
-
-
-
-$comment"
-
- if [[ $QABUILD == "true" ]] ; then
- echo ""
- echo ""
- echo "======================================================================"
- echo "======================================================================"
- echo " Adding comment to Jira."
- echo "======================================================================"
- echo "======================================================================"
- echo ""
- echo ""
- ### Update Jira with a comment
- export USER=jenkins
- $JIRACLI -s https://issues.apache.org/jira -a addcomment -u hadoopqa -p $JIRA_PASSWD --comment "$comment" --issue $defect
- $JIRACLI -s https://issues.apache.org/jira -a logout -u hadoopqa -p $JIRA_PASSWD
- fi
-}
-
-###############################################################################
-### Cleanup files
-cleanupAndExit () {
- local result=$1
- if [[ $QABUILD == "true" ]] ; then
- if [ -e "$PATCH_DIR" ] ; then
- mv $PATCH_DIR $BASEDIR
- fi
- fi
- echo ""
- echo ""
- echo "======================================================================"
- echo "======================================================================"
- echo " Finished build."
- echo "======================================================================"
- echo "======================================================================"
- echo ""
- echo ""
- exit $result
-}
-
-###############################################################################
-###############################################################################
-###############################################################################
-
-JIRA_COMMENT=""
-JIRA_COMMENT_FOOTER="Console output: $BUILD_URL/console
-
-This message is automatically generated."
-
-### Check if arguments to the script have been specified properly or not
-echo "----- Going to parser args -----"
-parseArgs $@
-cd $BASEDIR
-
-echo "----- Parsed args, going to checkout -----"
-checkout
-RESULT=$?
-if [[ $QABUILD == "true" ]] ; then
- if [[ $RESULT != 0 ]] ; then
- exit 100
- fi
-fi
-setup
-checkAuthor
-(( RESULT = RESULT + $? ))
-
-checkTests
-checkTestsResult=$?
-(( RESULT = RESULT + $checkTestsResult ))
-if [[ $checkTestsResult != 0 ]] ; then
- submitJiraComment 1
- cleanupAndExit 1
-fi
-checkJavadocWarnings
-(( RESULT = RESULT + $? ))
-checkJavacWarnings
-(( RESULT = RESULT + $? ))
-### Checkstyle not implemented yet
-#checkStyle
-#(( RESULT = RESULT + $? ))
-checkFindbugsWarnings
-(( RESULT = RESULT + $? ))
-checkReleaseAuditWarnings
-(( RESULT = RESULT + $? ))
-### Do not call these when run by a developer
-if [[ $QABUILD == "true" ]] ; then
- runCoreTests
- (( RESULT = RESULT + $? ))
- runContribTests
- (( RESULT = RESULT + $? ))
-fi
-JIRA_COMMENT_FOOTER="Test results: $BUILD_URL/testReport/
-$JIRA_COMMENT_FOOTER"
-
-submitJiraComment $RESULT
-cleanupAndExit $RESULT
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/cb9f303b/zookeeper-common/src/test/resources/test-patch.properties
----------------------------------------------------------------------
diff --git a/zookeeper-common/src/test/resources/test-patch.properties b/zookeeper-common/src/test/resources/test-patch.properties
deleted file mode 100644
index e459e3c..0000000
--- a/zookeeper-common/src/test/resources/test-patch.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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.
-
-OK_RELEASEAUDIT_WARNINGS=0
-OK_FINDBUGS_WARNINGS=0
-OK_JAVADOC_WARNINGS=0