opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-3.0' into stable-3.1

Browse Source 
* stable-3.0:
  Update git submodules
  Update git submodules
  Update git submodules
  Apply diff preferences immediately after clicking save
  Grant the InternalUser back access to changes
  Rewrite upload archive tests as real integration tests
  Add support for Elasticsearch version 7.7.*

Change-Id: I5c1a23713d3eeacc4ae36d039d6d8956a2a2ff1b
This commit is contained in:
Marco Miller
2020-05-15 10:57:53 -04:00
parent eda4c2cc98 aa7a8a0946
commit d2e554851f
22 changed files with 392 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
java/com/google/gerrit/acceptance/StandaloneSiteTest.java
View File

@@ -42,6 +42,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.InterruptedIOException;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.Collections;
import org.eclipse.jgit.lib.Config;
@@ -207,6 +208,22 @@ public abstract class StandaloneSiteTest {
ImmutableList<String> cmd, File dir, ImmutableMap<String, String> env) throws IOException {
ProcessBuilder pb = new ProcessBuilder(cmd);
pb.directory(dir).redirectErrorStream(true);
return execute(cmd, dir, env, null);
}
protected static String execute(
ImmutableList<String> cmd,
File dir,
ImmutableMap<String, String> env,
@Nullable Path outputPath)
throws IOException {
ProcessBuilder pb = new ProcessBuilder(cmd);
pb.directory(dir);
if (outputPath != null) {
pb.redirectOutput(outputPath.toFile());
} else {
pb.redirectErrorStream(true);
}
pb.environment().putAll(env);
Process p = pb.start();
byte[] out;