Skip to content

Commit e550fa7

Browse files
Fix linter errors
1 parent c5fde57 commit e550fa7

2 files changed

Lines changed: 10 additions & 7 deletions

File tree

cpp/src/arrow/dataset/file_parquet_encryption_test.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,8 @@ class DatasetExternalConfigEncryptionTestBase
515515
}
516516
}
517517

518-
static Result<std::shared_ptr<Table>> ReadDataset(const std::shared_ptr<Dataset>& dataset,
519-
bool use_threads) {
518+
static Result<std::shared_ptr<Table>> ReadDataset(
519+
const std::shared_ptr<Dataset>& dataset, bool use_threads) {
520520
ARROW_ASSIGN_OR_RAISE(auto scanner_builder, dataset->NewScan());
521521
ARROW_EXPECT_OK(scanner_builder->UseThreads(use_threads));
522522
ARROW_ASSIGN_OR_RAISE(auto scanner, scanner_builder->Finish());

python/pyarrow/tests/test_dataset_encryption.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,12 @@ def kms_factory(kms_connection_configuration):
9898

9999

100100
def get_agent_library_path():
101-
return os.environ.get(
102-
"DBPA_LIBRARY_PATH",
103-
"libDBPATestAgent.so" if platform.system() == "Linux" else "libDBPATestAgent.dylib",
101+
default = (
102+
"libDBPATestAgent.so"
103+
if platform.system() == "Linux"
104+
else "libDBPATestAgent.dylib"
104105
)
106+
return os.environ.get("DBPA_LIBRARY_PATH", default)
105107

106108

107109
def create_external_encryption_config():
@@ -285,9 +287,10 @@ def unwrap_key(self, wrapped_key: bytes, _: str) -> bytes:
285287
encryption_unavailable, reason="Parquet Encryption is not currently enabled"
286288
)
287289
def test_dataset_external_encryption_decryption():
288-
if not os.path.exists(get_agent_library_path()):
290+
agent_path = get_agent_library_path()
291+
if not os.path.exists(agent_path):
289292
pytest.skip(
290-
f"External DBPA agent library not found in path [{get_agent_library_path()}]"
293+
f"External DBPA agent library not found in path [{agent_path}]"
291294
)
292295

293296
table = create_sample_table()

0 commit comments

Comments
 (0)