opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.13'

Browse Source 
* stable-2.13: (22 commits)
  Allow submit of merge of non change branch
  Avoid unnecessary group visibility checks
  Fix broken submit tests
  Add @Sandboxed annotation for classes and methods
  Add tests for submit whole topic on multiple projects/branches
  Fix notes NPE for has:draft search predicate.
  Update git submodules
  Update download-commands plugin
  ProjectWatchIT: Test that watches of different users don't interfere
  Test that watches for other projects are not applied
  ProjectWatchIT#watchFile(): Use watchedRepo for both changes
  CommitBox: Remove unused parentWebLink elements
  Strip servlet API from GWT jar to avoid classpath collision
  Use recursive name lookup for PluginConfig
  BatchUpdate#newChangeContext: Add sanity check on unwrapped change
  Set version to 2.12.6
  AbstractSubmit: Add more assertions in submitWholeTopic
  Fix formatting of Apache Derby database documentation
  CherryPick: Update mergeTip for every cherry-pick
  AbstractSubmit: Add more assertions in submitWholeTopic
  Notice merged commits even if they appear on a different branch
  MergeTip: Expose initial tip

Change-Id: I39a30eec32b6cb0ef02622b8a328f5be345ebf8a
This commit is contained in:
David Pursehouse
2016-11-16 23:18:59 -08:00
parent 7959720c79 260598c529
commit a752d80516
12 changed files with 269 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
View File

@@ -30,6 +30,7 @@ import com.google.common.collect.Iterators;
import com.google.common.collect.Sets;
import com.google.common.primitives.Chars;
import com.google.gerrit.acceptance.AcceptanceTestRequestScope.Context;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.common.data.AccessSection;
import com.google.gerrit.common.data.ContributorAgreement;
import com.google.gerrit.common.data.GroupReference;
@@ -1138,4 +1139,13 @@ public abstract class AbstractDaemonTest {
assertThat(contentEntry.editB).isNull();
assertThat(contentEntry.skip).isNull();
}
protected TestRepository<?> createProjectWithPush(String name,
@Nullable Project.NameKey parent,
SubmitType submitType) throws Exception {
Project.NameKey project = createProject(name, parent, true, submitType);
grant(Permission.PUSH, project, "refs/heads/*");
grant(Permission.SUBMIT, project, "refs/for/refs/heads/*");
return cloneProject(project);
}
}