Merge pull request #822 from ajkannan/improve-dns-it

aozarov · aozarov · commit 45c466588e63 · 2016-03-30T10:16:09.000-07:00
Check if record added in ITDnsTest
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
@@ -593,9 +593,11 @@ public void testInvalidChangeRequest() {
         RecordSet.builder("subdomain." + zone.dnsName(), RecordSet.Type.A)
             .records(ImmutableList.of("0.255.1.5"))
             .build();
+    boolean recordAdded = false;
     try {
       ChangeRequestInfo validChange = ChangeRequest.builder().add(validA).build();
       zone.applyChangeRequest(validChange);
+      recordAdded = true;
       try {
         zone.applyChangeRequest(validChange);
         fail("Created a record set which already exists.");
@@ -648,9 +650,11 @@ public void testInvalidChangeRequest() {
         assertEquals(400, ex.code());
       }
     } finally {
-      ChangeRequestInfo deletion = ChangeRequest.builder().delete(validA).build();
-      ChangeRequest request = zone.applyChangeRequest(deletion);
-      waitForChangeToComplete(zone.name(), request.id());
+      if (recordAdded) {
+        ChangeRequestInfo deletion = ChangeRequest.builder().delete(validA).build();
+        ChangeRequest request = zone.applyChangeRequest(deletion);
+        waitForChangeToComplete(zone.name(), request.id());
+      }
       zone.delete();
     }
   }
