cf22d947fb
### What changes were proposed in this pull request? This PR will remove references to these "blacklist" and "whitelist" terms besides the blacklisting feature as a whole, which can be handled in a separate JIRA/PR. This touches quite a few files, but the changes are straightforward (variable/method/etc. name changes) and most quite self-contained. ### Why are the changes needed? As per discussion on the Spark dev list, it will be beneficial to remove references to problematic language that can alienate potential community members. One such reference is "blacklist" and "whitelist". While it seems to me that there is some valid debate as to whether these terms have racist origins, the cultural connotations are inescapable in today's world. ### Does this PR introduce _any_ user-facing change? In the test file `HiveQueryFileTest`, a developer has the ability to specify the system property `spark.hive.whitelist` to specify a list of Hive query files that should be tested. This system property has been renamed to `spark.hive.includelist`. The old property has been kept for compatibility, but will log a warning if used. I am open to feedback from others on whether keeping a deprecated property here is unnecessary given that this is just for developers running tests. ### How was this patch tested? Existing tests should be suitable since no behavior changes are expected as a result of this PR. Closes #28874 from xkrogen/xkrogen-SPARK-32036-rename-blacklists. Authored-by: Erik Krogen <ekrogen@linkedin.com> Signed-off-by: Thomas Graves <tgraves@apache.org>
84 lines
2.8 KiB
R
84 lines
2.8 KiB
R
#
|
|
# 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.
|
|
#
|
|
|
|
library(testthat)
|
|
library(SparkR)
|
|
|
|
# SPARK-25572
|
|
if (identical(Sys.getenv("NOT_CRAN"), "true")) {
|
|
# Turn all warnings into errors
|
|
options("warn" = 2)
|
|
|
|
if (.Platform$OS.type == "windows") {
|
|
Sys.setenv(TZ = "GMT")
|
|
}
|
|
|
|
# Setup global test environment
|
|
# Install Spark first to set SPARK_HOME
|
|
|
|
# NOTE(shivaram): We set overwrite to handle any old tar.gz files or directories left behind on
|
|
# CRAN machines. For Jenkins we should already have SPARK_HOME set.
|
|
install.spark(overwrite = TRUE)
|
|
|
|
sparkRDir <- file.path(Sys.getenv("SPARK_HOME"), "R")
|
|
sparkRAllowedSQLDirs <- c("spark-warehouse", "metastore_db")
|
|
invisible(lapply(sparkRAllowedSQLDirs,
|
|
function(x) { unlink(file.path(sparkRDir, x), recursive = TRUE, force = TRUE)}))
|
|
sparkRFilesBefore <- list.files(path = sparkRDir, all.files = TRUE)
|
|
|
|
sparkRTestMaster <- "local[1]"
|
|
sparkRTestConfig <- list()
|
|
if (identical(Sys.getenv("NOT_CRAN"), "true")) {
|
|
sparkRTestMaster <- ""
|
|
} else {
|
|
# Disable hsperfdata on CRAN
|
|
old_java_opt <- Sys.getenv("_JAVA_OPTIONS")
|
|
Sys.setenv("_JAVA_OPTIONS" = paste("-XX:-UsePerfData", old_java_opt))
|
|
tmpDir <- tempdir()
|
|
tmpArg <- paste0("-Djava.io.tmpdir=", tmpDir)
|
|
sparkRTestConfig <- list(spark.driver.extraJavaOptions = tmpArg,
|
|
spark.executor.extraJavaOptions = tmpArg)
|
|
}
|
|
|
|
test_package("SparkR")
|
|
|
|
if (identical(Sys.getenv("NOT_CRAN"), "true")) {
|
|
# set random seed for predictable results. mostly for base's sample() in tree and classification
|
|
set.seed(42)
|
|
|
|
# TODO (SPARK-30663) To be removed once testthat 1.x is removed from all builds
|
|
if (grepl("^1\\..*", packageVersion("testthat"))) {
|
|
# testthat 1.x
|
|
test_runner <- testthat:::run_tests
|
|
reporter <- "summary"
|
|
|
|
} else {
|
|
# testthat >= 2.0.0
|
|
test_runner <- testthat:::test_package_dir
|
|
reporter <- testthat::default_reporter()
|
|
}
|
|
|
|
test_runner("SparkR",
|
|
file.path(sparkRDir, "pkg", "tests", "fulltests"),
|
|
NULL,
|
|
reporter)
|
|
}
|
|
|
|
SparkR:::uninstallDownloadedSpark()
|
|
|
|
}
|