[HWKMETRICS-200] fix REST API test for counter rates

Now that the rates job is scheduled per tenant during tenant creation, the test needs to explicitly create the tenant. I also updated the createTenant method to concat the observable returned from scheduling the task with the index updates. This way the subscriber will be notified if any of the updates, along with scheduling the rates task, fails.
hawkular · Aug 12, 2015 · a4ed252 · a4ed252
1 parent 9076871
commit a4ed252
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java b/core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java
@@ -318,7 +318,7 @@ public void setTaskScheduler(TaskScheduler taskScheduler) {
     @Override
     public Observable<Void> createTenant(final Tenant tenant) {
         return Observable.create(subscriber -> {
-            Observable<ResultSet> updates = dataAccess.insertTenant(tenant).flatMap(resultSet -> {
+            Observable<Void> updates = dataAccess.insertTenant(tenant).flatMap(resultSet -> {
                 if (!resultSet.wasApplied()) {
                     throw new TenantAlreadyExistsException(tenant.getId());
                 }
@@ -328,14 +328,17 @@ public Observable<Void> createTenant(final Tenant tenant) {
                         .withInterval(1, TimeUnit.MINUTES)
                         .build();
                 Map<String, String> params = ImmutableMap.of("tenant", tenant.getId());
-                taskScheduler.scheduleTask("generate-rates", tenant.getId(), 100, params, trigger);
+                Observable<Void> ratesScheduled = taskScheduler.scheduleTask("generate-rates", tenant.getId(),
+                        100, params, trigger).map(task -> null);
 
-                return Observable.from(tenant.getRetentionSettings().entrySet())
+                Observable<Void> retentionUpdates = Observable.from(tenant.getRetentionSettings().entrySet())
                         .flatMap(entry -> dataAccess.updateRetentionsIndex(tenant.getId(), entry.getKey(),
-                                ImmutableMap.of(makeSafe(entry.getKey().getText()), entry.getValue())));
+                                ImmutableMap.of(makeSafe(entry.getKey().getText()), entry.getValue())))
+                        .map(rs -> null);
+
+                return ratesScheduled.concatWith(retentionUpdates);
             });
-            updates.subscribe(resultSet -> {
-            }, subscriber::onError, subscriber::onCompleted);
+            updates.subscribe(resultSet -> {}, subscriber::onError, subscriber::onCompleted);
         });
     }
 

diff --git a/rest-tests/src/test/groovy/org/hawkular/metrics/rest/CountersITest.groovy b/rest-tests/src/test/groovy/org/hawkular/metrics/rest/CountersITest.groovy
@@ -313,11 +313,10 @@ class CountersITest extends RESTTest {
 
     setTime(start)
 
-    // Create the counter metric
+    // Create the tenant
     def response = hawkularMetrics.post(
-        path: "counters",
-        headers: [(tenantHeaderName): tenantId],
-        body: [id: counter]
+        path: "tenants",
+        body: [id: tenantId]
     )
     assertEquals(201, response.status)