Permalink
Browse files

merge conflicts

Merge branch 'magellan' of github.com:nimbusproject/nimbus into magellan

Conflicts:
	cumulus/cb/pycb/cbRedirector.py
	cumulus/cb/pycb/cumulus.py
	tests/cc-unprop-md5test.py
  • Loading branch information...
2 parents 7e16c6f + 6275599 commit c08b3863e22421dfd22cc8d6e97a3d4742c8dc01 BuzzTroll committed Oct 29, 2010
Showing with 20 additions and 1 deletion.
  1. +1 −1 cumulus/cb/pycb/cbRedirector.py
  2. +1 −0 cumulus/reqs.txt
  3. +18 −0 tests/cc-unprop-md5test.py
View
2 cumulus/cb/pycb/cbRedirector.py
@@ -66,7 +66,7 @@ def get_hosts_min(self):
pycb.log(logging.ERROR, "get next host error %s" % (str(ex)))
return None
- def get_next_host_random(self):
+ def get_next_host(self):
try:
hosts = []
f = open(self.host_file, "r")
View
1 cumulus/reqs.txt
@@ -3,3 +3,4 @@ deps/pyOpenSSL-0.10.tar.gz
deps/zope.interface-3.6.1.tar.gz
deps/Twisted-10.0.0.tar.bz2
deps/nose-0.11.3.tar.gz
+deps/s3cmd-0.9.9.91-cumulus.tar.gz
View
18 tests/cc-unprop-md5test.py
@@ -11,6 +11,7 @@
cc_home=os.environ['CLOUD_CLIENT_HOME']
logfile = sys.stdout
newname=str(uuid.uuid1()).replace("-", "")
+localfile=str(uuid.uuid1()).replace("-", "")
src_file = "/etc/group"
sfa = src_file.split("/")
@@ -52,6 +53,23 @@
if rc != 0:
print "s3 info failed"
sys.exit(1)
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+# down load the new name with s3cmd
+cmd="s3cmd get s3://Repo/VMS/%s/%s %s" % (os.environ['NIMBUS_TEST_USER_CAN_ID'], image_name, localfile)
+print cmd
+(x, rc)=pexpect.run(cmd, withexitstatus=1, logfile=logfile)
+print x
+if rc != 0:
+ print "failed to save"
+ sys.exit(1)
+
+rc = filecmp.cmp(localfile, "/etc/group")
+os.remove(localfile)
+if not rc:
+ print "files differ"
+ sys.exit(1)
cmd="s3cmd info s3://Repo/VMS/%s/%s" % (os.environ['NIMBUS_TEST_USER_CAN_ID'], image_name)
print cmd

0 comments on commit c08b386

Please sign in to comment.