fix test compile

Ngone51 · Ngone51 · commit 3fa4ce5fcd2a · 2020-08-18T23:14:17.000+08:00
diff --git a/core/src/test/scala/org/apache/spark/deploy/DecommissionWorkerSuite.scala b/core/src/test/scala/org/apache/spark/deploy/DecommissionWorkerSuite.scala
@@ -57,7 +57,7 @@ class DecommissionWorkerSuite
   override def beforeEach(): Unit = {
     super.beforeEach()
     masterAndWorkerConf = new SparkConf()
-      .set(config.Worker.DECOMMISSION_ENABLED, true)
+      .set(config.DECOMMISSION_ENABLED, true)
     masterAndWorkerSecurityManager = new SecurityManager(masterAndWorkerConf)
     masterRpcEnv = RpcEnv.create(
       Master.SYSTEM_NAME,
diff --git a/core/src/test/scala/org/apache/spark/deploy/client/AppClientSuite.scala b/core/src/test/scala/org/apache/spark/deploy/client/AppClientSuite.scala
@@ -59,7 +59,7 @@ class AppClientSuite
    */
   override def beforeAll(): Unit = {
     super.beforeAll()
-    conf = new SparkConf().set(config.Worker.DECOMMISSION_ENABLED.key, "true")
+    conf = new SparkConf().set(config.DECOMMISSION_ENABLED.key, "true")
     securityManager = new SecurityManager(conf)
     masterRpcEnv = RpcEnv.create(Master.SYSTEM_NAME, "localhost", 0, conf, securityManager)
     workerRpcEnvs = (0 until numWorkers).map { i =>
diff --git a/core/src/test/scala/org/apache/spark/scheduler/WorkerDecommissionSuite.scala b/core/src/test/scala/org/apache/spark/scheduler/WorkerDecommissionSuite.scala
@@ -32,7 +32,7 @@ class WorkerDecommissionSuite extends SparkFunSuite with LocalSparkContext {
 
   override def beforeEach(): Unit = {
     val conf = new SparkConf().setAppName("test").setMaster("local")
-      .set(config.Worker.DECOMMISSION_ENABLED, true)
+      .set(config.DECOMMISSION_ENABLED, true)
 
     sc = new SparkContext("local-cluster[2, 1, 1024]", "test", conf)
   }
diff --git a/core/src/test/scala/org/apache/spark/storage/BlockManagerDecommissionIntegrationSuite.scala b/core/src/test/scala/org/apache/spark/storage/BlockManagerDecommissionIntegrationSuite.scala
@@ -65,7 +65,7 @@ class BlockManagerDecommissionIntegrationSuite extends SparkFunSuite with LocalS
     val migrateDuring = whenToDecom != JobEnded
     val master = s"local-cluster[${numExecs}, 1, 1024]"
     val conf = new SparkConf().setAppName("test").setMaster(master)
-      .set(config.Worker.DECOMMISSION_ENABLED, true)
+      .set(config.DECOMMISSION_ENABLED, true)
       .set(config.STORAGE_DECOMMISSION_ENABLED, true)
       .set(config.STORAGE_DECOMMISSION_RDD_BLOCKS_ENABLED, persist)
       .set(config.STORAGE_DECOMMISSION_SHUFFLE_BLOCKS_ENABLED, shuffle)

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class WorkerDecommissionSuite extends SparkFunSuite with LocalSparkContext {`
`32`	`32`
`33`	`33`	`override def beforeEach(): Unit = {`
`34`	`34`	`val conf = new SparkConf().setAppName("test").setMaster("local")`
`35`		`- .set(config.Worker.DECOMMISSION_ENABLED, true)`
	`35`	`+ .set(config.DECOMMISSION_ENABLED, true)`
`36`	`36`
`37`	`37`	`sc = new SparkContext("local-cluster[2, 1, 1024]", "test", conf)`
`38`	`38`	`}`