Reduced scope of powermock exclusion from org.apache.* to org.apache.zookeeper.* etc
Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/841c5f74 Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/841c5f74 Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/841c5f74 Branch: refs/heads/master Commit: 841c5f74d843d99cd2cb7df982239a5bb6003be6 Parents: ead8182 Author: Abhishek Tiwari <[email protected]> Authored: Sun Jul 30 21:31:11 2017 -0700 Committer: Abhishek Tiwari <[email protected]> Committed: Sun Jul 30 21:31:11 2017 -0700 ---------------------------------------------------------------------- .../aws/GobblinAWSClusterLauncherTest.java | 2 +- .../runtime/api/GobblinInstanceLauncher.conf | 21 -------------------- .../runtime/api/GobblinInstanceLauncher.conf | 21 ++++++++++++++++++++ 3 files changed, 22 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/841c5f74/gobblin-aws/src/test/java/org/apache/gobblin/aws/GobblinAWSClusterLauncherTest.java ---------------------------------------------------------------------- diff --git a/gobblin-aws/src/test/java/org/apache/gobblin/aws/GobblinAWSClusterLauncherTest.java b/gobblin-aws/src/test/java/org/apache/gobblin/aws/GobblinAWSClusterLauncherTest.java index 5cd9fb9..94ca55e 100644 --- a/gobblin-aws/src/test/java/org/apache/gobblin/aws/GobblinAWSClusterLauncherTest.java +++ b/gobblin-aws/src/test/java/org/apache/gobblin/aws/GobblinAWSClusterLauncherTest.java @@ -73,7 +73,7 @@ import org.apache.gobblin.testing.AssertWithBackoff; */ @Test(groups = { "gobblin.aws" }) @PrepareForTest({ AWSSdkClient.class, GobblinAWSClusterLauncher.class}) -@PowerMockIgnore({"javax.*", "org.apache.*", "org.w3c.*", "org.xml.*"}) +@PowerMockIgnore({"javax.*", "org.apache.helix.*", "org.apache.curator.*", "org.apache.zookeeper.*", "org.w3c.*", "org.xml.*"}) public class GobblinAWSClusterLauncherTest extends PowerMockTestCase implements HelixMessageTestBase { public final static Logger LOG = LoggerFactory.getLogger(GobblinAWSClusterLauncherTest.class); http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/841c5f74/gobblin-runtime/src/main/resources/gobblin/runtime/api/GobblinInstanceLauncher.conf ---------------------------------------------------------------------- diff --git a/gobblin-runtime/src/main/resources/gobblin/runtime/api/GobblinInstanceLauncher.conf b/gobblin-runtime/src/main/resources/gobblin/runtime/api/GobblinInstanceLauncher.conf deleted file mode 100644 index 9fa7307..0000000 --- a/gobblin-runtime/src/main/resources/gobblin/runtime/api/GobblinInstanceLauncher.conf +++ /dev/null @@ -1,21 +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. -# - -gobblin.instance { - startTimeoutMs: 1000 - shutdownTimeoutMs: 1000 -} http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/841c5f74/gobblin-runtime/src/main/resources/org/apache/gobblin/runtime/api/GobblinInstanceLauncher.conf ---------------------------------------------------------------------- diff --git a/gobblin-runtime/src/main/resources/org/apache/gobblin/runtime/api/GobblinInstanceLauncher.conf b/gobblin-runtime/src/main/resources/org/apache/gobblin/runtime/api/GobblinInstanceLauncher.conf new file mode 100644 index 0000000..9fa7307 --- /dev/null +++ b/gobblin-runtime/src/main/resources/org/apache/gobblin/runtime/api/GobblinInstanceLauncher.conf @@ -0,0 +1,21 @@ +# +# 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. +# + +gobblin.instance { + startTimeoutMs: 1000 + shutdownTimeoutMs: 1000 +}
