removed atmos from demos, since it is unreliable

This commit is contained in:
Adrian Cole 2010-03-01 23:36:47 -08:00
parent 8ad3955e36
commit 2dda30b922
2 changed files with 6 additions and 19 deletions

View File

@ -80,7 +80,7 @@ public class TweetStoreLiveTest {
// WATCH THIS.. when adding a new context, you must update the string // WATCH THIS.. when adding a new context, you must update the string
props.setProperty(SpringServletConfig.PROPERTY_BLOBSTORE_CONTEXTS, props.setProperty(SpringServletConfig.PROPERTY_BLOBSTORE_CONTEXTS,
"cloudfiles,s3,azureblob,atmos"); "cloudfiles,s3,azureblob");
props = new TwitterPropertiesBuilder(props).withCredentials( props = new TwitterPropertiesBuilder(props).withCredentials(
checkNotNull(System.getProperty(PROPERTY_TWITTER_USER), PROPERTY_TWITTER_USER), checkNotNull(System.getProperty(PROPERTY_TWITTER_USER), PROPERTY_TWITTER_USER),
@ -102,9 +102,6 @@ public class TweetStoreLiveTest {
PROPERTY_AZURESTORAGE_ACCOUNT), PROPERTY_AZURESTORAGE_ACCOUNT),
System.getProperty(PROPERTY_AZURESTORAGE_KEY, PROPERTY_AZURESTORAGE_KEY)).build(); System.getProperty(PROPERTY_AZURESTORAGE_KEY, PROPERTY_AZURESTORAGE_KEY)).build();
props = new AtmosStoragePropertiesBuilder(props).withCredentials(
checkNotNull(System.getProperty(PROPERTY_EMCSAAS_UID), PROPERTY_EMCSAAS_UID),
System.getProperty(PROPERTY_EMCSAAS_KEY, PROPERTY_EMCSAAS_KEY)).build();
server = new GoogleDevServer(); server = new GoogleDevServer();
server.writePropertiesAndStartServer(address, port, warfile, props); server.writePropertiesAndStartServer(address, port, warfile, props);
} }
@ -126,10 +123,7 @@ public class TweetStoreLiveTest {
.getProperty(PROPERTY_AZURESTORAGE_ACCOUNT), PROPERTY_AZURESTORAGE_ACCOUNT), System .getProperty(PROPERTY_AZURESTORAGE_ACCOUNT), PROPERTY_AZURESTORAGE_ACCOUNT), System
.getProperty(PROPERTY_AZURESTORAGE_KEY, PROPERTY_AZURESTORAGE_KEY)); .getProperty(PROPERTY_AZURESTORAGE_KEY, PROPERTY_AZURESTORAGE_KEY));
BlobStoreContext atContext = factory.createContext("atmos", checkNotNull(System this.contexts = ImmutableList.of(s3Context, cfContext, azContext);
.getProperty(PROPERTY_EMCSAAS_UID), PROPERTY_EMCSAAS_UID), System.getProperty(
PROPERTY_EMCSAAS_KEY, PROPERTY_EMCSAAS_KEY));
this.contexts = ImmutableList.of(s3Context, cfContext, azContext, atContext);
boolean deleted = false; boolean deleted = false;
for (BlobStoreContext context : contexts) { for (BlobStoreContext context : contexts) {
if (context.getBlobStore().containerExists(container)) { if (context.getBlobStore().containerExists(container)) {
@ -170,7 +164,7 @@ public class TweetStoreLiveTest {
public void testPrimeContainers() throws IOException, InterruptedException { public void testPrimeContainers() throws IOException, InterruptedException {
URL gurl = new URL(url, "/store/do"); URL gurl = new URL(url, "/store/do");
// WATCH THIS, you need to add a context each time // WATCH THIS, you need to add a context each time
for (String context : new String[] { "cloudfiles", "s3", "azureblob", "atmos" }) { for (String context : new String[] { "cloudfiles", "s3", "azureblob" }) {
System.out.println("storing at context: " + context); System.out.println("storing at context: " + context);
HttpURLConnection connection = (HttpURLConnection) gurl.openConnection(); HttpURLConnection connection = (HttpURLConnection) gurl.openConnection();
connection.addRequestProperty("X-AppEngine-QueueName", "twitter"); connection.addRequestProperty("X-AppEngine-QueueName", "twitter");

View File

@ -81,7 +81,7 @@ public class TweetStoreLiveTest {
// WATCH THIS.. when adding a new context, you must update the string // WATCH THIS.. when adding a new context, you must update the string
props props
.setProperty(GuiceServletConfig.PROPERTY_BLOBSTORE_CONTEXTS, .setProperty(GuiceServletConfig.PROPERTY_BLOBSTORE_CONTEXTS,
"cloudfiles,s3,azureblob,atmos"); "cloudfiles,s3,azureblob");
props = new TwitterPropertiesBuilder(props).withCredentials( props = new TwitterPropertiesBuilder(props).withCredentials(
checkNotNull(System.getProperty(PROPERTY_TWITTER_USER), PROPERTY_TWITTER_USER), checkNotNull(System.getProperty(PROPERTY_TWITTER_USER), PROPERTY_TWITTER_USER),
@ -103,10 +103,6 @@ public class TweetStoreLiveTest {
PROPERTY_AZURESTORAGE_ACCOUNT), PROPERTY_AZURESTORAGE_ACCOUNT),
System.getProperty(PROPERTY_AZURESTORAGE_KEY, PROPERTY_AZURESTORAGE_KEY)).build(); System.getProperty(PROPERTY_AZURESTORAGE_KEY, PROPERTY_AZURESTORAGE_KEY)).build();
props = new AtmosStoragePropertiesBuilder(props).withCredentials(
checkNotNull(System.getProperty(PROPERTY_EMCSAAS_UID), PROPERTY_EMCSAAS_UID),
System.getProperty(PROPERTY_EMCSAAS_KEY, PROPERTY_EMCSAAS_KEY)).build();
server = new GoogleDevServer(); server = new GoogleDevServer();
server.writePropertiesAndStartServer(address, port, warfile, props); server.writePropertiesAndStartServer(address, port, warfile, props);
} }
@ -128,10 +124,7 @@ public class TweetStoreLiveTest {
.getProperty(PROPERTY_AZURESTORAGE_ACCOUNT), PROPERTY_AZURESTORAGE_ACCOUNT), System .getProperty(PROPERTY_AZURESTORAGE_ACCOUNT), PROPERTY_AZURESTORAGE_ACCOUNT), System
.getProperty(PROPERTY_AZURESTORAGE_KEY, PROPERTY_AZURESTORAGE_KEY)); .getProperty(PROPERTY_AZURESTORAGE_KEY, PROPERTY_AZURESTORAGE_KEY));
BlobStoreContext atContext = factory.createContext("atmos", checkNotNull(System this.contexts = ImmutableList.of(s3Context, cfContext, azContext);
.getProperty(PROPERTY_EMCSAAS_UID), PROPERTY_EMCSAAS_UID), System.getProperty(
PROPERTY_EMCSAAS_KEY, PROPERTY_EMCSAAS_KEY));
this.contexts = ImmutableList.of(s3Context, cfContext, azContext, atContext);
boolean deleted = false; boolean deleted = false;
for (BlobStoreContext context : contexts) { for (BlobStoreContext context : contexts) {
if (context.getBlobStore().containerExists(container)) { if (context.getBlobStore().containerExists(container)) {
@ -173,7 +166,7 @@ public class TweetStoreLiveTest {
URL gurl = new URL(url, "/store/do"); URL gurl = new URL(url, "/store/do");
// WATCH THIS, you need to add a context each time // WATCH THIS, you need to add a context each time
for (String context : new String[] { "cloudfiles", "s3", "azureblob", "atmos" }) { for (String context : new String[] { "cloudfiles", "s3", "azureblob" }) {
System.out.println("storing at context: " + context); System.out.println("storing at context: " + context);
HttpURLConnection connection = (HttpURLConnection) gurl.openConnection(); HttpURLConnection connection = (HttpURLConnection) gurl.openConnection();
connection.addRequestProperty("X-AppEngine-QueueName", "twitter"); connection.addRequestProperty("X-AppEngine-QueueName", "twitter");