honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Watcher: Reenabling HipChatServiceTests 

The authentication token stopped working, deleted it and created a new one
on the hipchat web site. Tests are working now again.

Closes elastic/elasticsearch#3162

Original commit: elastic/x-pack-elasticsearch@a0623af799
This commit is contained in:
Alexander Reelsen 2016-09-05 12:27:14 +02:00
parent 09c7f534b3
commit 41334abda0
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherF.java
View File

@ -43,7 +43,7 @@ public class WatcherF {
// this is for the Watcher Test account in HipChat // this is for the Watcher Test account in HipChat
settings.put("xpack.notification.hipchat.account.user.profile", "user"); settings.put("xpack.notification.hipchat.account.user.profile", "user");
settings.put("xpack.notification.hipchat.account.user.auth_token", "FYVx16oDH78ZW9r13wtXbcszyoyA7oX5tiMWg9X0"); settings.put("xpack.notification.hipchat.account.user.auth_token", "12rNQUuQ0wObfRVeoVD8OeoAnosCT8tSTV5UjsII");
// this is for the `test-watcher-v1` notification token (hipchat) // this is for the `test-watcher-v1` notification token (hipchat)
settings.put("xpack.notification.hipchat.account.v1.profile", "v1"); settings.put("xpack.notification.hipchat.account.v1.profile", "v1");

7
elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HipChatServiceTests.java
View File

@ -9,11 +9,11 @@ import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.test.junit.annotations.Network; import org.elasticsearch.test.junit.annotations.Network;
import org.elasticsearch.test.junit.annotations.TestLogging; import org.elasticsearch.test.junit.annotations.TestLogging;
import org.elasticsearch.xpack.watcher.actions.hipchat.HipChatAction;
import org.elasticsearch.xpack.notification.hipchat.HipChatAccount; import org.elasticsearch.xpack.notification.hipchat.HipChatAccount;
import org.elasticsearch.xpack.notification.hipchat.HipChatMessage; import org.elasticsearch.xpack.notification.hipchat.HipChatMessage;
import org.elasticsearch.xpack.notification.hipchat.HipChatService; import org.elasticsearch.xpack.notification.hipchat.HipChatService;
import org.elasticsearch.xpack.notification.hipchat.SentMessages; import org.elasticsearch.xpack.notification.hipchat.SentMessages;
import org.elasticsearch.xpack.watcher.actions.hipchat.HipChatAction;
import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase; import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase;
import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse; import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse;
@ -56,7 +56,7 @@ public class HipChatServiceTests extends AbstractWatcherIntegrationTestCase {
// this is for the Watcher Test account in HipChat // this is for the Watcher Test account in HipChat
.put("xpack.notification.hipchat.account.user_account.profile", "user") .put("xpack.notification.hipchat.account.user_account.profile", "user")
.put("xpack.notification.hipchat.account.user_account.auth_token", "FYVx16oDH78ZW9r13wtXbcszyoyA7oX5tiMWg9X0") .put("xpack.notification.hipchat.account.user_account.auth_token", "12rNQUuQ0wObfRVeoVD8OeoAnosCT8tSTV5UjsII")
// this is for the `test-watcher-v1` notification token // this is for the `test-watcher-v1` notification token
.put("xpack.notification.hipchat.account.v1_account.profile", "v1") .put("xpack.notification.hipchat.account.v1_account.profile", "v1")
@ -99,7 +99,6 @@ public class HipChatServiceTests extends AbstractWatcherIntegrationTestCase {
assertSentMessagesAreValid(1, messages); assertSentMessagesAreValid(1, messages);
} }
@AwaitsFix(bugUrl = "https://github.com/elastic/x-plugins/issues/3162")
public void testSendMessageUserAccount() throws Exception { public void testSendMessageUserAccount() throws Exception {
HipChatService service = getInstanceFromMaster(HipChatService.class); HipChatService service = getInstanceFromMaster(HipChatService.class);
HipChatMessage.Color color = randomFrom(HipChatMessage.Color.values()); HipChatMessage.Color color = randomFrom(HipChatMessage.Color.values());
@ -118,7 +117,6 @@ public class HipChatServiceTests extends AbstractWatcherIntegrationTestCase {
assertSentMessagesAreValid(3, messages); assertSentMessagesAreValid(3, messages);
} }
@AwaitsFix(bugUrl = "https://github.com/elastic/x-plugins/issues/3162")
public void testWatchWithHipChatAction() throws Exception { public void testWatchWithHipChatAction() throws Exception {
HipChatAccount.Profile profile = randomFrom(HipChatAccount.Profile.values()); HipChatAccount.Profile profile = randomFrom(HipChatAccount.Profile.values());
HipChatMessage.Color color = randomFrom(HipChatMessage.Color.values()); HipChatMessage.Color color = randomFrom(HipChatMessage.Color.values());
@ -180,7 +178,6 @@ public class HipChatServiceTests extends AbstractWatcherIntegrationTestCase {
assertThat(response.getHits().getTotalHits(), is(1L)); assertThat(response.getHits().getTotalHits(), is(1L));
} }
@AwaitsFix(bugUrl = "https://github.com/elastic/x-plugins/issues/3162")
public void testDefaultValuesForColorAndFormatWorks() { public void testDefaultValuesForColorAndFormatWorks() {
HipChatService service = getInstanceFromMaster(HipChatService.class); HipChatService service = getInstanceFromMaster(HipChatService.class);
HipChatMessage hipChatMessage = new HipChatMessage( HipChatMessage hipChatMessage = new HipChatMessage(