Skip to content

Commit d8e9f6a

Browse files
mziccardmziccard
committed
---
yaml --- r: 3763 b: refs/heads/pubsub-alpha c: 4b1a4fd h: refs/heads/master i: 3761: 4a0dead 3759: 64da00d
1 parent 9b71e92 commit d8e9f6a

6 files changed

Lines changed: 50 additions & 9 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 36a62ef856d199f8efd09501b5ba65c422c01f23
33
refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
44
refs/heads/gh-pages: 7406918e071dd2c5677a638ae2a06e7592b6542c
5-
refs/heads/pubsub-alpha: 8db4b9b6f7b0c56c9b93c5a614a1c945b10336b6
5+
refs/heads/pubsub-alpha: 4b1a4fd3cf9624983dd35a048d26d11bfe12aa61
66
refs/heads/update-datastore: 47aae517c2cb33f1dccd909adaced73ec9d0f4df
77
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
88
refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd

‎branches/pubsub-alpha/RELEASING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Most of the release process is handled by the `after_success.sh` script, trigger
77
1. Run `utilities/update_pom_version.sh` from the repository's base directory.
88
This script takes an optional argument denoting the new version. By default, if the current version is X.Y.Z-SNAPSHOT, the script will update the version in all the pom.xml files to X.Y.Z. If desired, another version can be supplied via command line argument instead.
99

10-
2. Create a PR to update the pom.xml version.
11-
The PR should look something like [#225](https://github.com/GoogleCloudPlatform/gcloud-java/pull/225). After this PR is merged into GoogleCloudPlatform/gcloud-java, Travis CI will push a new website to GoogleCloudPlatform/gh-pages, push a new artifact to the Maven Central Repository, and update versions in the README files.
10+
2. Create a PR to update the pom.xml version. If releasing a new client library, this PR should also update javadoc grouping in the base directory's [pom.xml](./pom.xml).
11+
PRs that don't release new modules should look something like [#225](https://github.com/GoogleCloudPlatform/gcloud-java/pull/225). PRs that do release a new module should also add the appropriate packages to the javadoc groups "SPI" and "Test helpers", as shown in [#802](https://github.com/GoogleCloudPlatform/gcloud-java/pull/802) for `gcloud-java-dns`. After this PR is merged into GoogleCloudPlatform/gcloud-java, Travis CI will push a new website to GoogleCloudPlatform/gh-pages, push a new artifact to the Maven Central Repository, and update versions in the README files.
1212

1313
3. Before moving on, verify that the artifacts have successfully been pushed to the Maven Central Repository. Open Travis CI, click the ["Build History" tab](https://travis-ci.org/GoogleCloudPlatform/gcloud-java/builds), and open the second build's logs for Step 2's PR. Be sure that you are not opening the "Pull Request" build logs. When the build finishes, scroll to the end of the log and verify that the artifacts were successfully staged and deployed. You can also search for `gcloud-java` on the [Sonatype website](https://oss.sonatype.org/#nexus-search;quick~gcloud-java) and check the latest version number. If the deployment didn't succeed because of a flaky test, rerun the build.
1414

‎branches/pubsub-alpha/codacy-conf.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎branches/pubsub-alpha/gcloud-java-dns/src/main/java/com/google/gcloud/dns/testing/package-info.java‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/*
2+
* Copyright 2016 Google Inc. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
/**
18+
* A testing helper for Google Cloud DNS.
19+
*
20+
* <p>A simple usage example:
21+
* Before the test:
22+
* <pre> {@code
23+
* // Minimum delay before processing change requests (in ms). Setting the delay to 0 makes change
24+
* // request processing synchronous.
25+
* long delay = 0;
26+
* LocalDnsHelper dnsHelper = LocalDnsHelper.create(delay);
27+
* Dns dns = dnsHelper.options().service();
28+
* dnsHelper.start();
29+
* }</pre>
30+
*
31+
* <p>After the test:
32+
* <pre> {@code
33+
* dnsHelper.stop();
34+
* }</pre>
35+
*/
36+
package com.google.gcloud.dns.testing;

‎branches/pubsub-alpha/gcloud-java-dns/src/test/java/com/google/gcloud/dns/it/ITDnsTest.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -593,9 +593,11 @@ public void testInvalidChangeRequest() {
593593
RecordSet.builder("subdomain." + zone.dnsName(), RecordSet.Type.A)
594594
.records(ImmutableList.of("0.255.1.5"))
595595
.build();
596+
boolean recordAdded = false;
596597
try {
597598
ChangeRequestInfo validChange = ChangeRequest.builder().add(validA).build();
598599
zone.applyChangeRequest(validChange);
600+
recordAdded = true;
599601
try {
600602
zone.applyChangeRequest(validChange);
601603
fail("Created a record set which already exists.");
@@ -648,9 +650,11 @@ public void testInvalidChangeRequest() {
648650
assertEquals(400, ex.code());
649651
}
650652
} finally {
651-
ChangeRequestInfo deletion = ChangeRequest.builder().delete(validA).build();
652-
ChangeRequest request = zone.applyChangeRequest(deletion);
653-
waitForChangeToComplete(zone.name(), request.id());
653+
if (recordAdded) {
654+
ChangeRequestInfo deletion = ChangeRequest.builder().delete(validA).build();
655+
ChangeRequest request = zone.applyChangeRequest(deletion);
656+
waitForChangeToComplete(zone.name(), request.id());
657+
}
654658
zone.delete();
655659
}
656660
}

‎branches/pubsub-alpha/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/testing/package-info.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@
2222
* <pre> {@code
2323
* LocalResourceManagerHelper resourceManagerHelper = LocalResourceManagerHelper.create();
2424
* ResourceManager resourceManager = resourceManagerHelper.options().service();
25-
* } </pre>
25+
* resourceManagerHelper.start();
26+
* }</pre>
2627
*
2728
* <p>After the test:
2829
* <pre> {@code
2930
* resourceManagerHelper.stop();
30-
* } </pre>
31+
* }</pre>
3132
*/
3233
package com.google.gcloud.resourcemanager.testing;

0 commit comments

Comments
 (0)