From 1cdf6ff9961df6f4f41bca717f74bf99171a0bc7 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 28 Jun 2018 18:01:18 +0200 Subject: [PATCH] Unignored the test --- .../internal/spring/AcceptanceTests.java | 1 - .../projects/spring-cloud-release/git/HEAD | 2 +- .../spring-cloud-release/git/ORIG_HEAD | 2 +- .../projects/spring-cloud-release/git/index | Bin 2665 -> 2665 bytes .../spring-cloud-release/git/logs/HEAD | 3 +++ .../git/logs/refs/heads/Camden | 1 + .../spring-cloud-release/git/logs/refs/stash | 1 + .../56/1a933f652e9b274e17de2e1479b450dd429146 | Bin 0 -> 340 bytes .../93/61257d96daa4f989536719da2bf594cbb64690 | Bin 0 -> 197 bytes .../ae/4c7b35356cd1bd371c78ad0ba7d86fdea7653a | Bin 0 -> 223 bytes .../git/refs/heads/Camden | 1 + .../spring-cloud-release/git/refs/stash | 2 +- 12 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/Camden create mode 100644 spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/56/1a933f652e9b274e17de2e1479b450dd429146 create mode 100644 spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/93/61257d96daa4f989536719da2bf594cbb64690 create mode 100644 spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ae/4c7b35356cd1bd371c78ad0ba7d86fdea7653a create mode 100644 spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/refs/heads/Camden diff --git a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/AcceptanceTests.java b/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/AcceptanceTests.java index 26673040..4c67e71b 100644 --- a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/AcceptanceTests.java +++ b/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/AcceptanceTests.java @@ -191,7 +191,6 @@ public class AcceptanceTests { } @Test - @Ignore("Add a camden branch to the spring cloud release from sources") public void should_perform_a_meta_release_of_sc_release_and_consul() throws Exception { // simulates an org Map versions = new HashMap<>(); diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/HEAD b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/HEAD index cb089cd8..d178fa1c 100644 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/HEAD +++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/HEAD @@ -1 +1 @@ -ref: refs/heads/master +ref: refs/heads/Camden diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/ORIG_HEAD b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/ORIG_HEAD index 56d1bb27..056f1ba9 100644 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/ORIG_HEAD +++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/ORIG_HEAD @@ -1 +1 @@ -320597b84bb0312c15228c4d42f46c189b86ed90 +0ccd2833e149e9b8a7974ecf74a5e9e172322ab9 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/index b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/index index d976dd9f1a7415406d31404acc7df36e2dfea752..bd47c447fc592d404ca091d1806894f413a84bea 100644 GIT binary patch delta 1011 zcmaDU@>0aW#WTp6fq{Vuh{d8!S@QXIUsj6x;(Zy&XJBMtU}fC$U66sHaS4$310*)l zKt~0ru8C=pM-PmKsQV#;qOJj|Zh3(uSRIgtsuM*~cLAzy)6IKebwC=bP8?a?WCcbW zh{Zd&WWfr7G*qDkioym)7m&hyz7yY=(0n3KyNwI#v67x3rPUq{$?UMu8p{Z&eS2vnX0>}nTUcg=?lIp|RYY}+U zF_HiKhGTKsqL=sQ*KSthn9nG3U%vcmyok8Lf$Z;#UGC?V+9ciIJ6V&nM#Si@T3Gbm T-d8D`RStDq3N&0aW#WTp6fq{Vuh{Ym~ZCe7Q86u9AaD!+@1_luL{WDEr@F()>Lx2N+TgPI2#Uf6Mi&(vK6!_t@C75# zYV2NqjiS(k38%t0C<;4pD}0Nh@CI&$FHjU}FyplP8H&ORW}Lo$0#pdJ9uj|(A20*M z5xcLSqL}Ewf>Ysh6om^|d~lig2*qjvR-hYCb<2a(4wMF^9VVvGGbjoxSXFSv^;HzB z4}cV6_smNag&b@+6@Eog7{G?p*I!T+ZeUBX!Qq+n$O;)4gxZqk>n~rOGyR%Ss`7z3 z_x|>uE6)m>9Ken+!MQ(4a xzP+W;a$ecA)vs*}&sds&^X{Ci$yp=9m{4_kPRrqzx@kY^D#Z?c&&;mP0sw=!_!s~H diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/HEAD b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/HEAD index 8fd77239..a5adcf4a 100644 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/HEAD +++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/HEAD @@ -29,3 +29,6 @@ b566ab3bea0506bccaa10f83784a41673606d6ee 320597b84bb0312c15228c4d42f46c189b86ed9 0ccd2833e149e9b8a7974ecf74a5e9e172322ab9 29dde5f8e4c5096612ac8669dd7bfbcc95c7ef39 Marcin Grzejszczak 1489664824 +0100 checkout: moving from master to Dalston.RC1 29dde5f8e4c5096612ac8669dd7bfbcc95c7ef39 e4d44f5a1a67429e37edbb57d3da96bb6717266c Marcin Grzejszczak 1489668889 +0100 checkout: moving from Dalston.RC1 to vCamden.M1 e4d44f5a1a67429e37edbb57d3da96bb6717266c 0ccd2833e149e9b8a7974ecf74a5e9e172322ab9 Marcin Grzejszczak 1489668895 +0100 checkout: moving from e4d44f5a1a67429e37edbb57d3da96bb6717266c to master +0ccd2833e149e9b8a7974ecf74a5e9e172322ab9 0ccd2833e149e9b8a7974ecf74a5e9e172322ab9 Marcin Grzejszczak 1530201218 +0200 reset: moving to HEAD +0ccd2833e149e9b8a7974ecf74a5e9e172322ab9 320597b84bb0312c15228c4d42f46c189b86ed90 Marcin Grzejszczak 1530201221 +0200 checkout: moving from master to Camden.x +320597b84bb0312c15228c4d42f46c189b86ed90 320597b84bb0312c15228c4d42f46c189b86ed90 Marcin Grzejszczak 1530201227 +0200 checkout: moving from Camden.x to Camden diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/Camden b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/Camden new file mode 100644 index 00000000..4d0583a3 --- /dev/null +++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/heads/Camden @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 320597b84bb0312c15228c4d42f46c189b86ed90 Marcin Grzejszczak 1530201227 +0200 branch: Created from HEAD diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/stash b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/stash index 231713ad..fb6b8fc8 100644 --- a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/stash +++ b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/logs/refs/stash @@ -1 +1,2 @@ 0000000000000000000000000000000000000000 9d396e0bebeba62d284c8539c952f17d764647d1 Marcin Grzejszczak 1481128706 +0100 WIP on Camden.x: c8bb589 Bump versions for next release +9d396e0bebeba62d284c8539c952f17d764647d1 ae4c7b35356cd1bd371c78ad0ba7d86fdea7653a Marcin Grzejszczak 1530201217 +0200 WIP on master: 0ccd283 Updating Boot to 1.5.3.BS diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/56/1a933f652e9b274e17de2e1479b450dd429146 b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/56/1a933f652e9b274e17de2e1479b450dd429146 new file mode 100644 index 0000000000000000000000000000000000000000..8d290ceabd35b7cc12aa78544283e260e809eb8a GIT binary patch literal 340 zcmV-a0jvIa0V^p=O;s>9vtTeZFfcPQQP4}zEXhpI%P&f05KI4I;VOQsIr;H+X5-7w z-ql^s+hMATQ%g!R^U{m;Dspoea!dm?pT1dYrp>o-dZ%O0rX62@K7}bPDM~EMEY_<8 zDr-OZ$~$|*<%YtpAD`UrK07@5y>JXvnUANlt6#9IUP(m>!!_5;uws*WmhLZ}u5&Wh zdC8fn#SD8*vMk%<*lz?zMZBx!k6Qcsz@c?m^c0sQ7L}wH m=@ujwrRJ3|+?OxE8ZRPla3K5pVwd}Qr8Y_T_W}T?CzUZe-=+Tm literal 0 HcmV?d00001 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/93/61257d96daa4f989536719da2bf594cbb64690 b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/93/61257d96daa4f989536719da2bf594cbb64690 new file mode 100644 index 0000000000000000000000000000000000000000..14116e5907f7227408428a01d312f01cbdbf60fb GIT binary patch literal 197 zcmV;$06PD80i};IP6IIzMX7y?>5*3U*t@n7LMRPYD#QWCvyKytsQy=GmL{BcCYFixCC9dH(XwT literal 0 HcmV?d00001 diff --git a/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ae/4c7b35356cd1bd371c78ad0ba7d86fdea7653a b/spring-cloud-release-tools-spring/src/test/resources/projects/spring-cloud-release/git/objects/ae/4c7b35356cd1bd371c78ad0ba7d86fdea7653a new file mode 100644 index 0000000000000000000000000000000000000000..11780891c4a79b3233c610ff4f7eeaaf13b3aacf GIT binary patch literal 223 zcmV<503iQ(0i}=2O2j}AMP27BYA=NDs(z#f5t)s+5Cjp|)sKu(lMb2IMZVrf82kWt z_rg6FPAv00RUo3Py5$VkXJo2-4xn6>d7j8!QaWNlox%9fW3D#nBZQ5$dr z2JzgOIC>*CbAyo(CGcg>