From 25a6e2d58da9de8ef8857ce8f55959c251944366 Mon Sep 17 00:00:00 2001 From: rlynch2 Date: Thu, 3 Nov 2016 17:46:35 -0700 Subject: [PATCH] =?UTF-8?q?version=20not=20being=20updated=20on=20first=20?= =?UTF-8?q?request=20after=20update=20(including=20due=20to=20hard=20reset?= =?UTF-8?q?s)=20New=20remote=20branches=20New=20remote=20tags=20=E2=80=94?= =?UTF-8?q?=20handling=20a=20null=20ref=20in=20should=20pull=20no=20longer?= =?UTF-8?q?=20needed.=20=E2=80=94=20has=20added=20benefit=20of=20ensuring?= =?UTF-8?q?=20the=20local=20repo=20is=20current=20in=20case=20of=20git=20f?= =?UTF-8?q?ailure.=20Returns=20version=20for=20tags=20(version=20was=20nul?= =?UTF-8?q?l=20before=20this=20change)=20New=20starter=20code=20for=20remo?= =?UTF-8?q?te=20repo=20testing=20(where=20a=20lot=20of=20the=20complexity?= =?UTF-8?q?=20lies)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JGitEnvironmentRepositoryIntegrationTests.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryIntegrationTests.java index d2ef0c2f..6430b67d 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryIntegrationTests.java @@ -174,13 +174,15 @@ public class JGitEnvironmentRepositoryIntegrationTests { git.add().addFilepattern(".").call(); git.commit().setMessage("Conflicting commit.").call(); git.push().setForce(true).call(); + String conflictingCommit = git.log().setMaxCount(1).call().iterator() + .next().getName(); // Reset to the raw branch. git.reset().setMode(ResetType.HARD).setRef(commitToRevertBeforePull).call(); // Triggers the repository refresh. locations = repository.getLocations("bar", "test", "raw"); - assertEquals(locations.getVersion(), commitToRevertBeforePull); + assertEquals(locations.getVersion(), conflictingCommit); assertTrue("Local repository is not cleaned after retrieving resources.", git.status().call().isClean());