Skip to content
This repository has been archived by the owner on Sep 23, 2020. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
some ec2 tests pass
  • Loading branch information
BuzzTroll authored and timf committed Jun 21, 2010
1 parent 95d86d7 commit 8360bbf
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
Expand Up @@ -221,7 +221,7 @@

<property name="repoBucket" value="$COMMON{cumulus.repo.bucket}" />
<property name="prefix" value="$COMMON{cumulus.repo.prefix}" />
<property name="cumulusHost" value="$COMMON(cumulus.host}" />
<property name="cumulusHost" value="$COMMON{cumulus.host}" />

</bean>

Expand Down
Expand Up @@ -290,7 +290,7 @@ private static String cleanLocationBase(String givenLocationBase) {
// replace just gsiftp and check URL
String newTestURL = givenLocationBase.trim();
if (newTestURL.startsWith("cumulus")) {
newTestURL = newTestURL.replaceFirst("gsiftp", "http");
newTestURL = newTestURL.replaceFirst("cumulus", "http");
try {
url = new URL(newTestURL);
} catch (MalformedURLException e2) {
Expand Down
2 changes: 1 addition & 1 deletion messaging/query/java/source/etc/query/other/main.xml
Expand Up @@ -299,7 +299,7 @@ http://cxf.apache.org/schemas/jaxrs.xsd">

<property name="repoBucket" value="$COMMON{cumulus.repo.bucket}" />
<property name="prefix" value="$COMMON{cumulus.repo.prefix}" />
<property name="cumulusHost" value="$COMMON(cumulus.host}" />
<property name="cumulusHost" value="$COMMON{cumulus.host}" />
</bean>


Expand Down
10 changes: 4 additions & 6 deletions tests/ec2_test.py
Expand Up @@ -67,10 +67,10 @@ def tearDown(self):
self.db.close()


def test_ec2_list_empty(self):
# def test_ec2_list_empty(self):

images = self.ec2conn.get_all_images()
self.assertEqual(len(images), 0, "should be no images listed %d" % len(images))
# images = self.ec2conn.get_all_images()
# self.assertEqual(len(images), 0, "should be no images listed %d" % len(images))

def test_ec2_list_upload(self):
# obviously this will not work if the default name changes
Expand All @@ -83,9 +83,7 @@ def test_ec2_list_upload(self):
self.assertEqual(len(images), 1, "should be 1 image %d" % len(images))

for i in images:
print "+++++++++++++++++++++++++"
print i

self.fail("poop")



0 comments on commit 8360bbf

Please sign in to comment.