Skip to content

Commit 5a5f3e2

Browse files
harishreedharanharishreedharan
committed
Fix test ordering issue.
1 parent 0b66948 commit 5a5f3e2

File tree

5 files changed

+53
-53
lines changed

5 files changed

+53
-53
lines changed

‎core/src/test/resources/HistoryServerExpectations/application_list_json_expectation.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,22 @@
77
"sparkUser" : "irashid",
88
"completed" : true
99
} ]
10+
}, {
11+
"id" : "local-1430917381535",
12+
"name" : "Spark shell",
13+
"attempts" : [ {
14+
"attemptId" : "2",
15+
"startTime" : "2015-05-06T13:03:00.893GMT",
16+
"endTime" : "2015-05-06T13:03:00.950GMT",
17+
"sparkUser" : "irashid",
18+
"completed" : true
19+
}, {
20+
"attemptId" : "1",
21+
"startTime" : "2015-05-06T13:03:00.880GMT",
22+
"endTime" : "2015-05-06T13:03:00.890GMT",
23+
"sparkUser" : "irashid",
24+
"completed" : true
25+
} ]
1026
}, {
1127
"id" : "local-1426533911241",
1228
"name" : "Spark shell",
@@ -41,22 +57,6 @@
4157
"sparkUser" : "irashid",
4258
"completed" : true
4359
} ]
44-
}, {
45-
"id" : "local-1430917381535",
46-
"name" : "Spark shell",
47-
"attempts" : [ {
48-
"attemptId" : "1",
49-
"startTime" : "2015-05-06T13:03:00.893GMT",
50-
"endTime" : "2015-02-03T16:42:46.912GMT",
51-
"sparkUser" : "irashid",
52-
"completed" : true
53-
}, {
54-
"attemptId" : "2",
55-
"startTime" : "2015-05-06T13:03:00.893GMT",
56-
"endTime" : "2015-02-03T16:42:46.912GMT",
57-
"sparkUser" : "irashid",
58-
"completed" : true
59-
} ]
6060
}, {
6161
"id" : "local-1422981759269",
6262
"name" : "Spark shell",

‎core/src/test/resources/HistoryServerExpectations/completed_app_list_json_expectation.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,22 @@
77
"sparkUser" : "irashid",
88
"completed" : true
99
} ]
10+
}, {
11+
"id" : "local-1430917381535",
12+
"name" : "Spark shell",
13+
"attempts" : [ {
14+
"attemptId" : "2",
15+
"startTime" : "2015-05-06T13:03:00.893GMT",
16+
"endTime" : "2015-05-06T13:03:00.950GMT",
17+
"sparkUser" : "irashid",
18+
"completed" : true
19+
}, {
20+
"attemptId" : "1",
21+
"startTime" : "2015-05-06T13:03:00.880GMT",
22+
"endTime" : "2015-05-06T13:03:00.890GMT",
23+
"sparkUser" : "irashid",
24+
"completed" : true
25+
} ]
1026
}, {
1127
"id" : "local-1426533911241",
1228
"name" : "Spark shell",
@@ -41,22 +57,6 @@
4157
"sparkUser" : "irashid",
4258
"completed" : true
4359
} ]
44-
}, {
45-
"id" : "local-1430917381535",
46-
"name" : "Spark shell",
47-
"attempts" : [ {
48-
"attemptId" : "1",
49-
"startTime" : "2015-05-06T13:03:00.893GMT",
50-
"endTime" : "2015-02-03T16:42:46.912GMT",
51-
"sparkUser" : "irashid",
52-
"completed" : true
53-
}, {
54-
"attemptId" : "2",
55-
"startTime" : "2015-05-06T13:03:00.893GMT",
56-
"endTime" : "2015-02-03T16:42:46.912GMT",
57-
"sparkUser" : "irashid",
58-
"completed" : true
59-
} ]
6060
}, {
6161
"id" : "local-1422981759269",
6262
"name" : "Spark shell",

‎core/src/test/resources/HistoryServerExpectations/minDate_app_list_json_expectation.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,22 @@
77
"sparkUser" : "irashid",
88
"completed" : true
99
} ]
10+
}, {
11+
"id" : "local-1430917381535",
12+
"name" : "Spark shell",
13+
"attempts" : [ {
14+
"attemptId" : "2",
15+
"startTime" : "2015-05-06T13:03:00.893GMT",
16+
"endTime" : "2015-05-06T13:03:00.950GMT",
17+
"sparkUser" : "irashid",
18+
"completed" : true
19+
}, {
20+
"attemptId" : "1",
21+
"startTime" : "2015-05-06T13:03:00.880GMT",
22+
"endTime" : "2015-05-06T13:03:00.890GMT",
23+
"sparkUser" : "irashid",
24+
"completed" : true
25+
} ]
1026
}, {
1127
"id" : "local-1426533911241",
1228
"name" : "Spark shell",
@@ -34,20 +50,4 @@
3450
"completed": true
3551
}
3652
]
37-
}, {
38-
"id" : "local-1430917381535",
39-
"name" : "Spark shell",
40-
"attempts" : [ {
41-
"attemptId" : "1",
42-
"startTime" : "2015-05-06T13:03:00.893GMT",
43-
"endTime" : "2015-02-03T16:42:46.912GMT",
44-
"sparkUser" : "irashid",
45-
"completed" : true
46-
}, {
47-
"attemptId" : "2",
48-
"startTime" : "2015-05-06T13:03:00.893GMT",
49-
"endTime" : "2015-02-03T16:42:46.912GMT",
50-
"sparkUser" : "irashid",
51-
"completed" : true
52-
} ]
5353
} ]

‎core/src/test/resources/spark-events/local-1430917381535_1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{"Event":"SparkListenerLogStart","Spark Version":"1.4.0-SNAPSHOT"}
2-
{"Event":"SparkListenerBlockManagerAdded","Block Manager ID":{"Executor ID":"driver","Host":"localhost","Port":61103},"Maximum Memory":278019440,"Timestamp":1430917381651}
2+
{"Event":"SparkListenerBlockManagerAdded","Block Manager ID":{"Executor ID":"driver","Host":"localhost","Port":61103},"Maximum Memory":278019440,"Timestamp":1430917380880}
33
{"Event":"SparkListenerEnvironmentUpdate","JVM Information":{"Java Home":"/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre","Java Version":"1.8.0_25 (Oracle Corporation)","Scala Version":"version 2.10.4"},"Spark Properties":{"spark.driver.host":"192.168.1.102","spark.eventLog.enabled":"true","spark.driver.port":"61101","spark.repl.class.uri":"http://192.168.1.102:61100","spark.jars":"","spark.app.name":"Spark shell","spark.scheduler.mode":"FIFO","spark.executor.id":"driver","spark.master":"local[*]","spark.eventLog.dir":"/Users/irashid/github/kraps/core/src/test/resources/spark-events","spark.fileserver.uri":"http://192.168.1.102:61102","spark.tachyonStore.folderName":"spark-aaaf41b3-d1dd-447f-8951-acf51490758b","spark.app.id":"local-1430917381534"},"System Properties":{"java.io.tmpdir":"/var/folders/36/m29jw1z95qv4ywb1c4n0rz000000gp/T/","line.separator":"\n","path.separator":":","sun.management.compiler":"HotSpot 64-Bit Tiered Compilers","SPARK_SUBMIT":"true","sun.cpu.endian":"little","java.specification.version":"1.8","java.vm.specification.name":"Java Virtual Machine Specification","java.vendor":"Oracle Corporation","java.vm.specification.version":"1.8","user.home":"/Users/irashid","file.encoding.pkg":"sun.io","sun.nio.ch.bugLevel":"","ftp.nonProxyHosts":"local|*.local|169.254/16|*.169.254/16","sun.arch.data.model":"64","sun.boot.library.path":"/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre/lib","user.dir":"/Users/irashid/github/spark","java.library.path":"/Users/irashid/Library/Java/Extensions:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java:.","sun.cpu.isalist":"","os.arch":"x86_64","java.vm.version":"25.25-b02","java.endorsed.dirs":"/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre/lib/endorsed","java.runtime.version":"1.8.0_25-b17","java.vm.info":"mixed mode","java.ext.dirs":"/Users/irashid/Library/Java/Extensions:/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre/lib/ext:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java","java.runtime.name":"Java(TM) SE Runtime Environment","file.separator":"/","java.class.version":"52.0","scala.usejavacp":"true","java.specification.name":"Java Platform API Specification","sun.boot.class.path":"/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre/lib/resources.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre/lib/rt.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre/lib/sunrsasign.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre/lib/jsse.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre/lib/jce.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre/lib/charsets.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre/lib/jfr.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre/classes","file.encoding":"UTF-8","user.timezone":"America/Chicago","java.specification.vendor":"Oracle Corporation","sun.java.launcher":"SUN_STANDARD","os.version":"10.9.5","sun.os.patch.level":"unknown","gopherProxySet":"false","java.vm.specification.vendor":"Oracle Corporation","user.country":"US","sun.jnu.encoding":"UTF-8","http.nonProxyHosts":"local|*.local|169.254/16|*.169.254/16","user.language":"en","socksNonProxyHosts":"local|*.local|169.254/16|*.169.254/16","java.vendor.url":"http://java.oracle.com/","java.awt.printerjob":"sun.lwawt.macosx.CPrinterJob","java.awt.graphicsenv":"sun.awt.CGraphicsEnvironment","awt.toolkit":"sun.lwawt.macosx.LWCToolkit","os.name":"Mac OS X","java.vm.vendor":"Oracle Corporation","java.vendor.url.bug":"http://bugreport.sun.com/bugreport/","user.name":"irashid","java.vm.name":"Java HotSpot(TM) 64-Bit Server VM","sun.java.command":"org.apache.spark.deploy.SparkSubmit --conf spark.eventLog.enabled=true --conf spark.eventLog.dir=/Users/irashid/github/kraps/core/src/test/resources/spark-events --class org.apache.spark.repl.Main spark-shell","java.home":"/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre","java.version":"1.8.0_25","sun.io.unicode.encoding":"UnicodeBig"},"Classpath Entries":{"/etc/hadoop":"System Classpath","/Users/irashid/github/spark/lib_managed/jars/datanucleus-rdbms-3.2.9.jar":"System Classpath","/Users/irashid/github/spark/conf/":"System Classpath","/Users/irashid/github/spark/assembly/target/scala-2.10/spark-assembly-1.4.0-SNAPSHOT-hadoop2.5.0.jar":"System Classpath","/Users/irashid/github/spark/lib_managed/jars/datanucleus-core-3.2.10.jar":"System Classpath","/Users/irashid/github/spark/lib_managed/jars/datanucleus-api-jdo-3.2.6.jar":"System Classpath"}}
4-
{"Event":"SparkListenerApplicationStart","App Name":"Spark shell","App ID":"local-1430917381535","Timestamp":1430917380893,"User":"irashid","App Attempt ID":"1"}
5-
{"Event":"SparkListenerApplicationEnd","Timestamp":1422981766912}
4+
{"Event":"SparkListenerApplicationStart","App Name":"Spark shell","App ID":"local-1430917381535","Timestamp":1430917380880,"User":"irashid","App Attempt ID":"1"}
5+
{"Event":"SparkListenerApplicationEnd","Timestamp":1430917380890}

‎core/src/test/resources/spark-events/local-1430917381535_2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{"Event":"SparkListenerLogStart","Spark Version":"1.4.0-SNAPSHOT"}
2-
{"Event":"SparkListenerBlockManagerAdded","Block Manager ID":{"Executor ID":"driver","Host":"localhost","Port":61103},"Maximum Memory":278019440,"Timestamp":1430917381651}
2+
{"Event":"SparkListenerBlockManagerAdded","Block Manager ID":{"Executor ID":"driver","Host":"localhost","Port":61103},"Maximum Memory":278019440,"Timestamp":1430917380893}
33
{"Event":"SparkListenerEnvironmentUpdate","JVM Information":{"Java Home":"/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre","Java Version":"1.8.0_25 (Oracle Corporation)","Scala Version":"version 2.10.4"},"Spark Properties":{"spark.driver.host":"192.168.1.102","spark.eventLog.enabled":"true","spark.driver.port":"61101","spark.repl.class.uri":"http://192.168.1.102:61100","spark.jars":"","spark.app.name":"Spark shell","spark.scheduler.mode":"FIFO","spark.executor.id":"driver","spark.master":"local[*]","spark.eventLog.dir":"/Users/irashid/github/kraps/core/src/test/resources/spark-events","spark.fileserver.uri":"http://192.168.1.102:61102","spark.tachyonStore.folderName":"spark-aaaf41b3-d1dd-447f-8951-acf51490758b","spark.app.id":"local-1430917381534"},"System Properties":{"java.io.tmpdir":"/var/folders/36/m29jw1z95qv4ywb1c4n0rz000000gp/T/","line.separator":"\n","path.separator":":","sun.management.compiler":"HotSpot 64-Bit Tiered Compilers","SPARK_SUBMIT":"true","sun.cpu.endian":"little","java.specification.version":"1.8","java.vm.specification.name":"Java Virtual Machine Specification","java.vendor":"Oracle Corporation","java.vm.specification.version":"1.8","user.home":"/Users/irashid","file.encoding.pkg":"sun.io","sun.nio.ch.bugLevel":"","ftp.nonProxyHosts":"local|*.local|169.254/16|*.169.254/16","sun.arch.data.model":"64","sun.boot.library.path":"/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre/lib","user.dir":"/Users/irashid/github/spark","java.library.path":"/Users/irashid/Library/Java/Extensions:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java:.","sun.cpu.isalist":"","os.arch":"x86_64","java.vm.version":"25.25-b02","java.endorsed.dirs":"/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre/lib/endorsed","java.runtime.version":"1.8.0_25-b17","java.vm.info":"mixed mode","java.ext.dirs":"/Users/irashid/Library/Java/Extensions:/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre/lib/ext:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java","java.runtime.name":"Java(TM) SE Runtime Environment","file.separator":"/","java.class.version":"52.0","scala.usejavacp":"true","java.specification.name":"Java Platform API Specification","sun.boot.class.path":"/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre/lib/resources.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre/lib/rt.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre/lib/sunrsasign.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre/lib/jsse.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre/lib/jce.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre/lib/charsets.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre/lib/jfr.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre/classes","file.encoding":"UTF-8","user.timezone":"America/Chicago","java.specification.vendor":"Oracle Corporation","sun.java.launcher":"SUN_STANDARD","os.version":"10.9.5","sun.os.patch.level":"unknown","gopherProxySet":"false","java.vm.specification.vendor":"Oracle Corporation","user.country":"US","sun.jnu.encoding":"UTF-8","http.nonProxyHosts":"local|*.local|169.254/16|*.169.254/16","user.language":"en","socksNonProxyHosts":"local|*.local|169.254/16|*.169.254/16","java.vendor.url":"http://java.oracle.com/","java.awt.printerjob":"sun.lwawt.macosx.CPrinterJob","java.awt.graphicsenv":"sun.awt.CGraphicsEnvironment","awt.toolkit":"sun.lwawt.macosx.LWCToolkit","os.name":"Mac OS X","java.vm.vendor":"Oracle Corporation","java.vendor.url.bug":"http://bugreport.sun.com/bugreport/","user.name":"irashid","java.vm.name":"Java HotSpot(TM) 64-Bit Server VM","sun.java.command":"org.apache.spark.deploy.SparkSubmit --conf spark.eventLog.enabled=true --conf spark.eventLog.dir=/Users/irashid/github/kraps/core/src/test/resources/spark-events --class org.apache.spark.repl.Main spark-shell","java.home":"/Library/Java/JavaVirtualMachines/jdk1.8.0_25.jdk/Contents/Home/jre","java.version":"1.8.0_25","sun.io.unicode.encoding":"UnicodeBig"},"Classpath Entries":{"/etc/hadoop":"System Classpath","/Users/irashid/github/spark/lib_managed/jars/datanucleus-rdbms-3.2.9.jar":"System Classpath","/Users/irashid/github/spark/conf/":"System Classpath","/Users/irashid/github/spark/assembly/target/scala-2.10/spark-assembly-1.4.0-SNAPSHOT-hadoop2.5.0.jar":"System Classpath","/Users/irashid/github/spark/lib_managed/jars/datanucleus-core-3.2.10.jar":"System Classpath","/Users/irashid/github/spark/lib_managed/jars/datanucleus-api-jdo-3.2.6.jar":"System Classpath"}}
44
{"Event":"SparkListenerApplicationStart","App Name":"Spark shell","App ID":"local-1430917381535","Timestamp":1430917380893,"User":"irashid","App Attempt ID":"2"}
5-
{"Event":"SparkListenerApplicationEnd","Timestamp":1422981766912}
5+
{"Event":"SparkListenerApplicationEnd","Timestamp":1430917380950}

0 commit comments

Comments
 (0)