opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-3.3'

Browse Source 
* stable-3.3:
  Patch rules_nodejs library to fix wrong regex string escape
  ChangeInfo: Serve reviewers when LABELS are requested
  Bump Bazel version to 4.0.0
  MultiBaseLocalDiskRepositoryManagerTest: fix for running on Mac from Eclipse

Change-Id: If7c57e6023aed6fd09b9f6db78f6ba04d7d993e2
This commit is contained in:
David Ostrovsky
2021-02-07 17:46:49 +01:00
parent 41623da45e 74e3a4d7c7
commit be4f448521
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.bazelversion
View File

@@ -1 +1 @@
3.7.0
4.0.0

6
javatests/com/google/gerrit/server/git/MultiBaseLocalDiskRepositoryManagerTest.java
View File

@@ -93,12 +93,14 @@ public class MultiBaseLocalDiskRepositoryManagerTest {
Repository repo = repoManager.createRepository(someProjectKey);
assertThat(repo.getDirectory()).isNotNull();
assertThat(repo.getDirectory().exists()).isTrue();
assertThat(repo.getDirectory().getParent()).isEqualTo(alternateBasePath.toString());
assertThat(repo.getDirectory().getParent())
.isEqualTo(alternateBasePath.toRealPath().toString());
repo = repoManager.openRepository(someProjectKey);
assertThat(repo.getDirectory()).isNotNull();
assertThat(repo.getDirectory().exists()).isTrue();
assertThat(repo.getDirectory().getParent()).isEqualTo(alternateBasePath.toString());
assertThat(repo.getDirectory().getParent())
.isEqualTo(alternateBasePath.toRealPath().toString());
assertThat(repoManager.getBasePath(someProjectKey).toAbsolutePath().toString())
.isEqualTo(alternateBasePath.toString());