Github user srowen commented on a diff in the pull request:
https://github.com/apache/spark/pull/4993#discussion_r26386849
--- Diff: core/src/test/scala/org/apache/spark/SparkContextSuite.scala ---
@@ -79,26 +79,49 @@ class SparkContextSuite extends FunSuite with
LocalSparkContext {
val byteArray2 = converter.convert(bytesWritable)
assert(byteArray2.length === 0)
}
-
+
test("addFile works") {
- val file = File.createTempFile("someprefix", "somesuffix")
- val absolutePath = file.getAbsolutePath
+ val file1 = File.createTempFile("someprefix1", "somesuffix1")
+ val absolutePath1 = file1.getAbsolutePath
+
+ val pluto = Utils.createTempDir()
+ val file2 = File.createTempFile("someprefix2", "somesuffix2", pluto)
+ val relativePath = file2.getParent + "/../" +
file2.getParentFile.getName + "/" + file2.getName
+ val absolutePath2 = file2.getAbsolutePath
+
try {
- Files.write("somewords", file, UTF_8)
- val length = file.length()
+ Files.write("somewords1", file1, UTF_8)
+ Files.write("somewords2", file2, UTF_8)
+ val length1 = file1.length()
+ val length2 = file2.length()
+
sc = new SparkContext(new
SparkConf().setAppName("test").setMaster("local"))
- sc.addFile(file.getAbsolutePath)
+ sc.addFile(file1.getAbsolutePath)
+ sc.addFile(relativePath)
sc.parallelize(Array(1), 1).map(x => {
- val gotten = new File(SparkFiles.get(file.getName))
- if (!gotten.exists()) {
- throw new SparkException("file doesn't exist")
+ val gotten1 = new File(SparkFiles.get(file1.getName))
+ val gotten2 = new File(SparkFiles.get(file2.getName))
+ if (!gotten1.exists()) {
+ throw new SparkException("file doesn't exist : " + absolutePath1)
+ }
+ if (!gotten2.exists()) {
+ throw new SparkException("file doesn't exist : " + absolutePath2)
--- End diff --
These and others can now use string interpolation, while we're here
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
