Skip to content

Commit e587851

Browse files
jgreitemannthoughtpolice
authored andcommitted
config-schema: rename schema test module used by datatest
Because the datatests don't use the default libtest harness, datatests and normal tests cannot be mixed in the same module or even binary. `test_config_schema` is renamed, both to reflect that it is unlike the other `test_*` modules, but also to make the name available for "normal" tests related to the config schema.
1 parent 908fb6e commit e587851

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

cli/tests/test_config_schema.rs renamed to cli/tests/datatest_config_schema.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
// Copyright 2025 The Jujutsu Authors
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// https://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
115
use std::path::Path;
216
use std::process::Command;
317
use std::process::Output;

cli/tests/datatest_runner.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
mod test_config_schema;
1+
mod datatest_config_schema;
22

33
datatest_stable::harness! {
44
{
5-
test = test_config_schema::taplo_check_config_valid,
5+
test = datatest_config_schema::taplo_check_config_valid,
66
root = "src/config",
77
pattern = r".*\.toml",
88
},
99
{
10-
test = test_config_schema::taplo_check_config_valid,
10+
test = datatest_config_schema::taplo_check_config_valid,
1111
root = "tests/sample-configs/valid",
1212
pattern = r".*\.toml",
1313
},
1414
{
15-
test = test_config_schema::taplo_check_config_invalid,
15+
test = datatest_config_schema::taplo_check_config_invalid,
1616
root = "tests/sample-configs/invalid",
1717
pattern = r".*\.toml",
1818
}

0 commit comments

Comments
 (0)