aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google/devtools/build/lib
diff options
context:
space:
mode:
authorGravatar Akira Baruah <akira.baruah@gmail.com>2017-11-08 21:41:11 +0100
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2017-11-09 18:29:20 +0100
commit7459a2117709ba927ed80f70233397598918dfa0 (patch)
treee959d648c0a085a6b219f36ee207baab2b408a8b /src/test/java/com/google/devtools/build/lib
parent4193c0fb51a027f6cc143784f0b522842597103c (diff)
GitHub repository archive download
Addresses #3661 and fixes #3770 bug Changes: - Properly escape the download URL. `GitCloner` used to incorrectly escape `/` delimiters as `%2F`. This change was originally introduced in #3770 but [rolled back](https://github.com/akira-baruah/bazel/commit/58c003cf98b81d433603eeeb3874c7dbba33e1f0) due to a bug that is now fixed below. - Omit an initial "v" from a version tag (e.g. `v1.2.3`) in the archive prefix. GitHub seems to do this. Closes #4002. PiperOrigin-RevId: 175047685
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib')
-rw-r--r--src/test/java/com/google/devtools/build/lib/bazel/repository/GitClonerTest.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/repository/GitClonerTest.java b/src/test/java/com/google/devtools/build/lib/bazel/repository/GitClonerTest.java
index 10b668b171..738058c421 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/repository/GitClonerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/repository/GitClonerTest.java
@@ -19,9 +19,11 @@ import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyListOf;
import static org.mockito.Matchers.anyMapOf;
import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
import com.google.devtools.build.lib.bazel.repository.cache.RepositoryCache;
@@ -82,6 +84,14 @@ public class GitClonerTest extends BuildViewTestCase {
HttpDownloadValue value = GitCloner.clone(
rule, outputDirectory, eventHandler, clientEnvironment, downloader);
+ verify(downloader)
+ .download(
+ eq(ImmutableList.of(new URL("https://github.com/foo/bar/archive/1.2.3.tar.gz"))),
+ any(String.class),
+ eq(Optional.of("tar.gz")),
+ eq(outputDirectory),
+ any(ExtendedEventHandler.class),
+ anyMapOf(String.class, String.class));
assertThat(value).isNotNull();
assertThat(value.getPath()).isEqualTo(outputDirectory);
}