aboutsummaryrefslogtreecommitdiff
path: root/tags
diff options
context:
space:
mode:
authorJosh Rosen <joshrosen@databricks.com>2015-11-10 15:58:30 -0800
committerReynold Xin <rxin@databricks.com>2015-11-10 15:58:30 -0800
commit1dde39d796bbf42336051a86bedf871c7fddd513 (patch)
treea3a90cade110fe4b3c70039934b9a12d572ab8fa /tags
parent32790fe7249b0efe2cbc5c4ee2df0fb687dcd624 (diff)
downloadspark-1dde39d796bbf42336051a86bedf871c7fddd513.tar.gz
spark-1dde39d796bbf42336051a86bedf871c7fddd513.tar.bz2
spark-1dde39d796bbf42336051a86bedf871c7fddd513.zip
[SPARK-9818] Re-enable Docker tests for JDBC data source
This patch re-enables tests for the Docker JDBC data source. These tests were reverted in #4872 due to transitive dependency conflicts introduced by the `docker-client` library. This patch should avoid those problems by using a version of `docker-client` which shades its transitive dependencies and by performing some build-magic to work around problems with that shaded JAR. In addition, I significantly refactored the tests to simplify the setup and teardown code and to fix several Docker networking issues which caused problems when running in `boot2docker`. Closes #8101. Author: Josh Rosen <joshrosen@databricks.com> Author: Yijie Shen <henry.yijieshen@gmail.com> Closes #9503 from JoshRosen/docker-jdbc-tests.
Diffstat (limited to 'tags')
-rw-r--r--tags/src/main/java/org/apache/spark/tags/DockerTest.java26
1 files changed, 26 insertions, 0 deletions
diff --git a/tags/src/main/java/org/apache/spark/tags/DockerTest.java b/tags/src/main/java/org/apache/spark/tags/DockerTest.java
new file mode 100644
index 0000000000..0fecf3b8f9
--- /dev/null
+++ b/tags/src/main/java/org/apache/spark/tags/DockerTest.java
@@ -0,0 +1,26 @@
+/*
+ * 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.spark.tags;
+
+import java.lang.annotation.*;
+import org.scalatest.TagAnnotation;
+
+@TagAnnotation
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.TYPE})
+public @interface DockerTest { }