Skip to content

Commit cd94991

Browse files
RajivTSmeta-codesync[bot]
authored andcommitted
Enable per-bookmark locking by default in tests
Summary: Set `scm/mononoke:per_bookmark_locking` to `true` in the canonical JustKnobs defaults file used by both integration tests and Rust unit tests. This means new pushrebase tests automatically run with per-bookmark locking enabled, matching the production target state. Existing tests that explicitly call `merge_just_knobs` to enable it are now redundant but harmless. The shadow-mode test explicitly sets it to `false` and continues to work correctly. Reviewed By: lmvasquezg Differential Revision: D101818448 fbshipit-source-id: 56f15f7c8d01eb50cfb64d69bc28686fff02156e
1 parent 25e4041 commit cd94991

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

eden/mononoke/common/mononoke_macros/just_knobs_defaults/just_knobs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"scm/mononoke:cross_repo_pause_backsyncer": false,
7373
"scm/mononoke:allow_bare_author_unixname": true,
7474
"scm/mononoke:lock_users_directory": false,
75-
"scm/mononoke:per_bookmark_locking": false,
75+
"scm/mononoke:per_bookmark_locking": true,
7676
"scm/mononoke:per_bookmark_locking_shadow": false,
7777
"scm/mononoke:add_acl_manifest_pointer": true
7878
},

eden/mononoke/features/pushrebase/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3344,6 +3344,7 @@ mod tests {
33443344
"scm/mononoke:pushrebase_dry_run_merge_resolution".to_string() => KnobVal::Bool(false),
33453345
"scm/mononoke:pushrebase_enable_merge_resolution".to_string() => KnobVal::Bool(false),
33463346
"scm/mononoke:pushrebase_merge_resolution_derive_fsnodes".to_string() => KnobVal::Bool(true),
3347+
"scm/mononoke:per_bookmark_locking".to_string() => KnobVal::Bool(false),
33473348
}));
33483349
}
33493350

0 commit comments

Comments
 (0)