Adjusted clear not to collide when parallel test are running.

mderka · mderka · commit a463dc1a60e0 · 2016-03-04T09:44:45.000-08:00
diff --git a/gcloud-java-dns/src/test/java/com/google/gcloud/dns/it/ITDnsTest.java b/gcloud-java-dns/src/test/java/com/google/gcloud/dns/it/ITDnsTest.java
@@ -101,17 +101,21 @@ public class ITDnsTest {
       .delete(A_RECORD_ZONE1)
       .delete(AAAA_RECORD_ZONE1)
       .build();
+  public static final List<String> ZONE_NAMES = ImmutableList.of(ZONE_NAME1,
+      ZONE_NAME_EMPTY_DESCRIPTION);
 
   public static void clear() {
-    Page<Zone> zones = DNS.listZones();
-    Iterator<Zone> zoneIterator = zones.iterateAll();
-    while (zoneIterator.hasNext()) {
-      Zone zone = zoneIterator.next();
-      List<DnsRecord> toDelete = new LinkedList<>();
-      if (zone.name().startsWith(PREFIX)) {
-        Iterator<DnsRecord> dnsRecordIterator = zone.listDnsRecords().iterateAll();
-        while (dnsRecordIterator.hasNext()) {
-          DnsRecord record = dnsRecordIterator.next();
+    for (String zoneName : ZONE_NAMES) {
+      Zone zone = DNS.getZone(zoneName);
+      if (zone != null) {
+        Iterator<ChangeRequest> iterator = zone.listChangeRequests().iterateAll();
+        while (iterator.hasNext()) {
+          waitUntilComplete(zoneName, iterator.next().id());
+        }
+        Iterator<DnsRecord> recordIterator = zone.listDnsRecords().iterateAll();
+        List<DnsRecord> toDelete = new LinkedList<>();
+        while (recordIterator.hasNext()) {
+          DnsRecord record = recordIterator.next();
           if (!ImmutableList.of(DnsRecord.Type.NS, DnsRecord.Type.SOA).contains(record.type())) {
             toDelete.add(record);
           }
@@ -130,7 +134,7 @@ private static List<Zone> filter(Iterator<Zone> iterator) {
     List<Zone> result = new LinkedList<>();
     while (iterator.hasNext()) {
       Zone zone = iterator.next();
-      if (zone.name().startsWith(PREFIX)) {
+      if (ZONE_NAMES.contains(zone.name())) {
         result.add(zone);
       }
     }
