Skip to content

Commit d268ee7

Browse files
zjffduXun Liu
zjffdu
authored and
Xun Liu
committed
fix test (#2)
1 parent 97f17ac commit d268ee7

File tree

19 files changed

+172
-194
lines changed

19 files changed

+172
-194
lines changed

‎angular/pom.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,23 @@
5353
<artifactId>slf4j-log4j12</artifactId>
5454
</dependency>
5555

56+
<dependency>
57+
<groupId>commons-logging</groupId>
58+
<artifactId>commons-logging</artifactId>
59+
</dependency>
60+
61+
<dependency>
62+
<groupId>org.apache.commons</groupId>
63+
<artifactId>commons-lang3</artifactId>
64+
<version>3.4</version>
65+
</dependency>
66+
67+
<dependency>
68+
<groupId>commons-io</groupId>
69+
<artifactId>commons-io</artifactId>
70+
<version>2.4</version>
71+
</dependency>
72+
5673
<dependency>
5774
<groupId>junit</groupId>
5875
<artifactId>junit</artifactId>

‎bin/interpreter.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ fi
7979
# add test classes for unittest
8080
if [[ -d "${ZEPPELIN_HOME}/zeppelin-zengine/target/test-classes" ]]; then
8181
ZEPPELIN_INTP_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-zengine/target/test-classes"
82+
if [[ -n "${ZEPPELIN_ZENGINE_TEST}" ]]; then
83+
addJarInDirForIntp "${ZEPPELIN_HOME}/zeppelin-zengine/target/test-classes"
84+
fi
8285
fi
8386

8487
addJarInDirForIntp "${ZEPPELIN_HOME}/zeppelin-interpreter-api/target"

‎markdown/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@
8080
<version>2.4</version>
8181
</dependency>
8282

83+
<dependency>
84+
<groupId>commons-logging</groupId>
85+
<artifactId>commons-logging</artifactId>
86+
</dependency>
87+
8388
<dependency>
8489
<groupId>junit</groupId>
8590
<artifactId>junit</artifactId>

‎python/pom.xml‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,11 @@
3535
<properties>
3636
<interpreter.name>python</interpreter.name>
3737
<python.py4j.version>0.10.7</python.py4j.version>
38-
<grpc.version>1.4.0</grpc.version>
38+
<grpc.version>1.15.0</grpc.version>
3939
<interpreter.jar.name>python-interpreter-with-py4j</interpreter.jar.name>
4040
</properties>
4141

4242
<dependencies>
43-
<dependency>
44-
<groupId>${project.groupId}</groupId>
45-
<artifactId>zeppelin-interpreter</artifactId>
46-
<version>${project.version}</version>
47-
</dependency>
48-
4943
<dependency>
5044
<groupId>org.apache.commons</groupId>
5145
<artifactId>commons-exec</artifactId>
@@ -68,6 +62,26 @@
6862
<artifactId>slf4j-log4j12</artifactId>
6963
</dependency>
7064

65+
<dependency>
66+
<groupId>commons-logging</groupId>
67+
<artifactId>commons-logging</artifactId>
68+
</dependency>
69+
70+
<dependency>
71+
<groupId>commons-lang</groupId>
72+
<artifactId>commons-lang</artifactId>
73+
</dependency>
74+
75+
<dependency>
76+
<groupId>commons-io</groupId>
77+
<artifactId>commons-io</artifactId>
78+
</dependency>
79+
80+
<dependency>
81+
<groupId>commons-codec</groupId>
82+
<artifactId>commons-codec</artifactId>
83+
</dependency>
84+
7185
<dependency>
7286
<groupId>io.grpc</groupId>
7387
<artifactId>grpc-netty</artifactId>

‎python/src/test/java/org/apache/zeppelin/python/IPythonInterpreterTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ public void testGrpcFrameSize() throws InterpreterException, IOException {
214214
List<InterpreterResultMessage> interpreterResultMessages =
215215
context.out.toInterpreterResultMessage();
216216
assertEquals(1, interpreterResultMessages.size());
217-
assertTrue(interpreterResultMessages.get(0).getData().contains("exceeds maximum: 3000"));
217+
assertTrue(interpreterResultMessages.get(0).getData().contains("exceeds maximum size 3000"));
218218

219219
// next call continue work
220220
result = interpreter.interpret("print(1)", context);

‎python/src/test/resources/log4j.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
2424
log4j.appender.stdout.layout.ConversionPattern=%5p [%d] ({%t} %F[%M]:%L) - %m%n
2525

2626

27-
log4j.logger.org.apache.zeppelin.python=DEBUG
27+
log4j.logger.org.apache.zeppelin.python=INFO

‎shell/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@
5858
<artifactId>slf4j-log4j12</artifactId>
5959
</dependency>
6060

61+
<dependency>
62+
<groupId>commons-logging</groupId>
63+
<artifactId>commons-logging</artifactId>
64+
</dependency>
65+
6166
<dependency>
6267
<groupId>org.apache.commons</groupId>
6368
<artifactId>commons-exec</artifactId>

‎spark/interpreter/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,11 @@
292292
<version>${commons.exec.version}</version>
293293
</dependency>
294294

295+
<dependency>
296+
<groupId>commons-logging</groupId>
297+
<artifactId>commons-logging</artifactId>
298+
</dependency>
299+
295300
<dependency>
296301
<groupId>org.scala-lang</groupId>
297302
<artifactId>scala-library</artifactId>

‎zeppelin-integration/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
<!--test library versions-->
4646
<selenium.java.version>3.8.1</selenium.java.version>
47-
<commons.lang3.version>3.4</commons.lang3.version>
47+
<commons.lang3.version>3.7</commons.lang3.version>
4848

4949
<!--plugin library versions-->
5050
<plugin.failsafe.version>2.16</plugin.failsafe.version>

‎zeppelin-interpreter-parent/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,13 @@
128128
</configuration>
129129
</plugin>
130130

131-
<plugin>
132-
<groupId>org.apache.maven.plugins</groupId>
133-
<artifactId>maven-dependency-plugin</artifactId>
134-
<configuration>
135-
<skip>true</skip>
136-
</configuration>
137-
</plugin>
131+
<!--<plugin>-->
132+
<!--<groupId>org.apache.maven.plugins</groupId>-->
133+
<!--<artifactId>maven-dependency-plugin</artifactId>-->
134+
<!--<configuration>-->
135+
<!--<skip>true</skip>-->
136+
<!--</configuration>-->
137+
<!--</plugin>-->
138138

139139
</plugins>
140140
</build>

0 commit comments

Comments
 (0)