Skip to content

Commit c29b405

Browse files
mderkamderka
committed
Added sleep and renamed change completion check.
1 parent 75269ff commit c29b405

File tree

1 file changed

+40
-40
lines changed

1 file changed

+40
-40
lines changed

‎gcloud-java-dns/src/test/java/com/google/gcloud/dns/ITDnsTest.java‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -62,24 +62,20 @@ public class ITDnsTest {
6262
.description(ZONE_DESCRIPTION1)
6363
.dnsName(ZONE_DNS_NAME1)
6464
.build();
65-
public static final ZoneInfo ZONE_NAME_ERROR =
66-
ZoneInfo.builder(ZONE_NAME_TOO_LONG)
67-
.description(ZONE_DESCRIPTION1)
68-
.dnsName(ZONE_DNS_NAME1)
69-
.build();
70-
public static final ZoneInfo ZONE_MISSING_DESCRIPTION =
71-
ZoneInfo.builder(ZONE_NAME1)
72-
.dnsName(ZONE_DNS_NAME1)
73-
.build();
74-
public static final ZoneInfo ZONE_MISSING_DNS_NAME =
75-
ZoneInfo.builder(ZONE_NAME1)
76-
.description(ZONE_DESCRIPTION1)
77-
.build();
78-
public static final ZoneInfo ZONE_DNS_NO_PERIOD =
79-
ZoneInfo.builder(ZONE_NAME1)
80-
.description(ZONE_DESCRIPTION1)
81-
.dnsName(ZONE_DNS_NAME_NO_PERIOD)
82-
.build();
65+
public static final ZoneInfo ZONE_NAME_ERROR = ZoneInfo.builder(ZONE_NAME_TOO_LONG)
66+
.description(ZONE_DESCRIPTION1)
67+
.dnsName(ZONE_DNS_NAME1)
68+
.build();
69+
public static final ZoneInfo ZONE_MISSING_DESCRIPTION = ZoneInfo.builder(ZONE_NAME1)
70+
.dnsName(ZONE_DNS_NAME1)
71+
.build();
72+
public static final ZoneInfo ZONE_MISSING_DNS_NAME = ZoneInfo.builder(ZONE_NAME1)
73+
.description(ZONE_DESCRIPTION1)
74+
.build();
75+
public static final ZoneInfo ZONE_DNS_NO_PERIOD = ZoneInfo.builder(ZONE_NAME1)
76+
.description(ZONE_DESCRIPTION1)
77+
.dnsName(ZONE_DNS_NAME_NO_PERIOD)
78+
.build();
8379
public static final DnsRecord A_RECORD_ZONE1 =
8480
DnsRecord.builder("www." + ZONE1.dnsName(), DnsRecord.Type.A)
8581
.records(ImmutableList.of("123.123.55.1"))
@@ -116,7 +112,7 @@ public static void clear() {
116112
if (!toDelete.isEmpty()) {
117113
ChangeRequest deletion =
118114
zone.applyChangeRequest(ChangeRequest.builder().deletions(toDelete).build());
119-
checkChangeComplete(zone.name(), deletion.id());
115+
waitUntilComplete(zone.name(), deletion.id());
120116
}
121117
zone.delete();
122118
}
@@ -150,12 +146,17 @@ private static void assertEqChangesIgnoreStatus(ChangeRequest expected, ChangeRe
150146
assertEquals(unifiedEx, unifiedAct);
151147
}
152148

153-
private static void checkChangeComplete(String zoneName, String changeId) {
149+
private static void waitUntilComplete(String zoneName, String changeId) {
154150
while (true) {
155151
ChangeRequest changeRequest = DNS.getChangeRequest(zoneName, changeId,
156152
Dns.ChangeRequestOption.fields(Dns.ChangeRequestField.STATUS));
157153
if (ChangeRequest.Status.DONE.equals(changeRequest.status())) {
158-
break;
154+
return;
155+
}
156+
try {
157+
Thread.sleep(10);
158+
} catch (InterruptedException e) {
159+
fail("Thread was interrupted while waiting for change proceesing.");
159160
}
160161
}
161162
}
@@ -529,7 +530,6 @@ public void testDeleteZone() {
529530
}
530531
}
531532

532-
533533
@Test
534534
public void testCreateChange() {
535535
try {
@@ -542,9 +542,9 @@ public void testCreateChange() {
542542
assertTrue(ImmutableList.of(ChangeRequest.Status.PENDING, ChangeRequest.Status.DONE)
543543
.contains(created.status()));
544544
assertEqChangesIgnoreStatus(created, DNS.getChangeRequest(ZONE1.name(), "1"));
545-
checkChangeComplete(ZONE1.name(), "1");
545+
waitUntilComplete(ZONE1.name(), "1");
546546
DNS.applyChangeRequest(ZONE1.name(), CHANGE_DELETE_ZONE1);
547-
checkChangeComplete(ZONE1.name(), "2");
547+
waitUntilComplete(ZONE1.name(), "2");
548548
// with options
549549
created = DNS.applyChangeRequest(ZONE1.name(), CHANGE_ADD_ZONE1,
550550
Dns.ChangeRequestOption.fields(Dns.ChangeRequestField.ID));
@@ -553,29 +553,29 @@ public void testCreateChange() {
553553
assertTrue(created.deletions().isEmpty());
554554
assertEquals("3", created.id());
555555
assertNull(created.status());
556-
checkChangeComplete(ZONE1.name(), "3");
556+
waitUntilComplete(ZONE1.name(), "3");
557557
DNS.applyChangeRequest(ZONE1.name(), CHANGE_DELETE_ZONE1);
558-
checkChangeComplete(ZONE1.name(), "4");
558+
waitUntilComplete(ZONE1.name(), "4");
559559
created = DNS.applyChangeRequest(ZONE1.name(), CHANGE_ADD_ZONE1,
560560
Dns.ChangeRequestOption.fields(Dns.ChangeRequestField.STATUS));
561561
assertTrue(created.additions().isEmpty());
562562
assertNull(created.startTimeMillis());
563563
assertTrue(created.deletions().isEmpty());
564564
assertEquals("5", created.id());
565565
assertNotNull(created.status());
566-
checkChangeComplete(ZONE1.name(), "5");
566+
waitUntilComplete(ZONE1.name(), "5");
567567
DNS.applyChangeRequest(ZONE1.name(), CHANGE_DELETE_ZONE1);
568-
checkChangeComplete(ZONE1.name(), "6");
568+
waitUntilComplete(ZONE1.name(), "6");
569569
created = DNS.applyChangeRequest(ZONE1.name(), CHANGE_ADD_ZONE1,
570570
Dns.ChangeRequestOption.fields(Dns.ChangeRequestField.START_TIME));
571571
assertTrue(created.additions().isEmpty());
572572
assertNotNull(created.startTimeMillis());
573573
assertTrue(created.deletions().isEmpty());
574574
assertEquals("7", created.id());
575575
assertNull(created.status());
576-
checkChangeComplete(ZONE1.name(), "7");
576+
waitUntilComplete(ZONE1.name(), "7");
577577
DNS.applyChangeRequest(ZONE1.name(), CHANGE_DELETE_ZONE1);
578-
checkChangeComplete(ZONE1.name(), "8");
578+
waitUntilComplete(ZONE1.name(), "8");
579579
created = DNS.applyChangeRequest(ZONE1.name(), CHANGE_ADD_ZONE1,
580580
Dns.ChangeRequestOption.fields(Dns.ChangeRequestField.ADDITIONS));
581581
assertEquals(CHANGE_ADD_ZONE1.additions(), created.additions());
@@ -584,16 +584,16 @@ public void testCreateChange() {
584584
assertEquals("9", created.id());
585585
assertNull(created.status());
586586
// finishes with delete otherwise we cannot delete the zone
587-
checkChangeComplete(ZONE1.name(), "9");
587+
waitUntilComplete(ZONE1.name(), "9");
588588
created = DNS.applyChangeRequest(ZONE1.name(), CHANGE_DELETE_ZONE1,
589589
Dns.ChangeRequestOption.fields(Dns.ChangeRequestField.DELETIONS));
590-
checkChangeComplete(ZONE1.name(), "10");
590+
waitUntilComplete(ZONE1.name(), "10");
591591
assertEquals(CHANGE_DELETE_ZONE1.deletions(), created.deletions());
592592
assertNull(created.startTimeMillis());
593593
assertTrue(created.additions().isEmpty());
594594
assertEquals("10", created.id());
595595
assertNull(created.status());
596-
checkChangeComplete(ZONE1.name(), "10");
596+
waitUntilComplete(ZONE1.name(), "10");
597597
} finally {
598598
clear();
599599
}
@@ -618,13 +618,13 @@ public void testListChanges() {
618618
assertEquals(1, changes.size()); // default change creating SOA and NS
619619
// zone has changes
620620
ChangeRequest change = DNS.applyChangeRequest(ZONE1.name(), CHANGE_ADD_ZONE1);
621-
checkChangeComplete(ZONE1.name(), change.id());
621+
waitUntilComplete(ZONE1.name(), change.id());
622622
change = DNS.applyChangeRequest(ZONE1.name(), CHANGE_DELETE_ZONE1);
623-
checkChangeComplete(ZONE1.name(), change.id());
623+
waitUntilComplete(ZONE1.name(), change.id());
624624
change = DNS.applyChangeRequest(ZONE1.name(), CHANGE_ADD_ZONE1);
625-
checkChangeComplete(ZONE1.name(), change.id());
625+
waitUntilComplete(ZONE1.name(), change.id());
626626
change = DNS.applyChangeRequest(ZONE1.name(), CHANGE_DELETE_ZONE1);
627-
checkChangeComplete(ZONE1.name(), change.id());
627+
waitUntilComplete(ZONE1.name(), change.id());
628628
changes = ImmutableList.copyOf(DNS.listChangeRequests(ZONE1.name()).iterateAll());
629629
assertEquals(5, changes.size());
630630
// error in options
@@ -846,7 +846,7 @@ public void testListDnsRecords() {
846846
assertEquals(1, ImmutableList.copyOf(dnsRecordPage.values().iterator()).size());
847847
// test name filter
848848
ChangeRequest change = DNS.applyChangeRequest(ZONE1.name(), CHANGE_ADD_ZONE1);
849-
checkChangeComplete(ZONE1.name(), change.id());
849+
waitUntilComplete(ZONE1.name(), change.id());
850850
dnsRecordIterator = DNS.listDnsRecords(ZONE1.name(),
851851
Dns.DnsRecordListOption.dnsName(A_RECORD_ZONE1.name())).iterateAll();
852852
counter = 0;
@@ -858,7 +858,7 @@ public void testListDnsRecords() {
858858
}
859859
assertEquals(2, counter);
860860
// test type filter
861-
checkChangeComplete(ZONE1.name(), change.id());
861+
waitUntilComplete(ZONE1.name(), change.id());
862862
dnsRecordIterator = DNS.listDnsRecords(ZONE1.name(),
863863
Dns.DnsRecordListOption.dnsName(A_RECORD_ZONE1.name()),
864864
Dns.DnsRecordListOption.type(A_RECORD_ZONE1.type()))
@@ -897,7 +897,7 @@ public void testListDnsRecords() {
897897
assertEquals(400, ex.code());
898898
// todo(mderka) test retry functionality when available
899899
}
900-
checkChangeComplete(ZONE1.name(), change.id());
900+
waitUntilComplete(ZONE1.name(), change.id());
901901
} finally {
902902
clear();
903903
}

0 commit comments

Comments
 (0)