Remove multithreaded tests

gguuss · lesv · commit fe9374d7e1b8 · 2020-04-18T11:21:15.000-07:00
diff --git a/iot/api-client/manager/src/test/java/com/example/cloud/iot/examples/ManagerIT.java b/iot/api-client/manager/src/test/java/com/example/cloud/iot/examples/ManagerIT.java
@@ -55,10 +55,10 @@ public class ManagerIT {
   private static final String CLOUD_REGION = "us-central1";
   private static final String ES_PATH = "resources/ec_public.pem";
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
-  private static final String REGISTRY_ID = "java-reg-" + (System.currentTimeMillis() / 1000L);
+  private static final String REGISTRY_ID = "java-reg" + (System.currentTimeMillis() / 100L);
   private static final String RSA_PATH = "resources/rsa_cert.pem";
   private static final String PKCS_PATH = "resources/rsa_private_pkcs8";
-  private static final String TOPIC_ID = "java-pst-" + (System.currentTimeMillis() / 1000L);
+  private static final String TOPIC_ID = "java-pst-" + (System.currentTimeMillis() / 100L);
   private static final String MEMBER = "group:dpebot@google.com";
   private static final String ROLE = "roles/viewer";
 
@@ -110,7 +110,7 @@ public void clearTestRegistries() throws Exception {
           long regSecs = Long.parseLong(registryId.substring(
               "java-reg-".length(), registryId.length()));
           long diffSecs = currSecs - regSecs;
-          if (diffSecs > (60 * 60 * 24 * 7)) { // tests from last week or older
+          if (diffSecs > (60 * 60 * 24 * 7 * 10)) { // tests from last week or older
             System.out.println("Remove Id: " + r.getId());
             DeviceRegistryExample.clearRegistry(CLOUD_REGION, PROJECT_ID, registryId);
           }
@@ -124,6 +124,8 @@ public void clearTestRegistries() throws Exception {
   @Test
   public void testPatchRsa() throws Exception {
     final String deviceName = "patchme-device-rsa";
+    topic = DeviceRegistryExample.createIotTopic(PROJECT_ID, TOPIC_ID);
+
     try {
       DeviceRegistryExample.createRegistry(CLOUD_REGION, PROJECT_ID, REGISTRY_ID, TOPIC_ID);
       DeviceRegistryExample.createDeviceWithNoAuth(
@@ -599,7 +601,7 @@ public void testMqttDeviceState() throws Exception {
     }
   }
 
-  @Test
+  @Ignore @Test
   public void testGatewayListenForDevice() throws Exception {
     final String gatewayName = "rsa-listen-gateway";
     final String deviceName = "rsa-listen-device";
