Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

removing harded references to group

  • Loading branch information...
commit d77163506e973e77878e458059237e26e2ba4912 1 parent 49e734e
@buzztroll buzztroll authored
View
10 tests/cc-1000-test.py
@@ -16,11 +16,11 @@
cmd = "%s/bin/cloud-client.sh --transfer --sourcefile %s" % (cc_home, tst_image_src)
(x, rc)=pexpect.run(cmd, withexitstatus=1)
-cmd = "%s/bin/cloud-client.sh --run --name group --hours .25" % (cc_home)
+cmd = "%s/bin/cloud-client.sh --run --name %s --hours .25" % (cc_home, tst_image_name)
child = pexpect.spawn (cmd, timeout=to, maxread=20000, logfile=logfile)
rc = child.expect ('Running:')
if rc != 0:
- print "group not found in the list"
+ print "%s not found in the list" % (tst_image_name)
sys.exit(1)
handle = child.readline().strip().replace("'", "")
rc = child.expect(pexpect.EOF)
@@ -36,11 +36,11 @@
print "failed to terminate"
sys.exit(1)
-cmd = "%s/bin/cloud-client.sh --run --name group --hours .25" % (cc_home)
+cmd = "%s/bin/cloud-client.sh --run --name %s --hours .25" % (cc_home, tst_image_name)
child = pexpect.spawn (cmd, timeout=to, maxread=20000, logfile=logfile)
rc = child.expect ('Running:')
if rc != 0:
- print "group not found in the list"
+ print "%s not found in the list" % (tst_image_name)
sys.exit(1)
handle = child.readline().strip().replace("'", "")
rc = child.expect(pexpect.EOF)
@@ -57,6 +57,6 @@
sys.exit(1)
-cmd = "%s/bin/cloud-client.sh --delete --name group" % (cc_home)
+cmd = "%s/bin/cloud-client.sh --delete --name %s" % (cc_home, tst_image_name)
(x, rc)=pexpect.run(cmd, withexitstatus=1)
sys.exit(0)
View
8 tests/cc-list-test.py
@@ -10,7 +10,7 @@
cc_home=os.environ['CLOUD_CLIENT_HOME']
logfile = sys.stdout
-(x, rc)=pexpect.run("%s/bin/cloud-client.sh --delete --name group" % (cc_home), withexitstatus=1)
+(x, rc)=pexpect.run("%s/bin/cloud-client.sh --delete --name %s" % (cc_home, tst_image_name), withexitstatus=1)
print x
cmd = "%s/bin/cloud-client.sh --transfer --sourcefile %s" % (cc_home, tst_image_src)
@@ -22,9 +22,9 @@
cmd = "%s/bin/cloud-client.sh --list" % (cc_home)
child = pexpect.spawn (cmd, timeout=to, maxread=20000, logfile=logfile)
-rc = child.expect ('group')
+rc = child.expect (tst_image_name)
if rc != 0:
- print "group not found in the list"
+ print "%s not found in the list" % (tst_image_name)
sys.exit(1)
print child.before
rc = child.expect(pexpect.EOF)
@@ -33,7 +33,7 @@
print "failed to list"
sys.exit(1)
-(x, rc)=pexpect.run("%s/bin/cloud-client.sh --delete --name group" % (cc_home) , withexitstatus=1)
+(x, rc)=pexpect.run("%s/bin/cloud-client.sh --delete --name %s" % (cc_home, tst_image_name) , withexitstatus=1)
print x
if rc != 0:
print "failed to delete"
View
4 tests/cc-prop-test.py
@@ -20,11 +20,11 @@
cmd = "%s/bin/cloud-client.sh --transfer --sourcefile %s" % (cc_home, tst_image_src)
(x, rc)=pexpect.run(cmd, withexitstatus=1)
-cmd = "%s/bin/cloud-client.sh --run --name group --hours .25 --newname %s" % (cc_home, newname)
+cmd = "%s/bin/cloud-client.sh --run --name %s --hours .25 --newname %s" % (cc_home, tst_image_name, newname)
child = pexpect.spawn (cmd, timeout=to, maxread=20000, logfile=logfile)
rc = child.expect ('Running:')
if rc != 0:
- print "group not found in the list"
+ print "%s not found in the list" % (tst_image_name)
sys.exit(1)
handle = child.readline().strip().replace("'", "")
rc = child.expect(pexpect.EOF)
View
4 tests/cc-prop2-test.py
@@ -19,11 +19,11 @@
cmd = "%s/bin/cloud-client.sh --transfer --sourcefile %s" % (cc_home, tst_image_src)
(x, rc)=pexpect.run(cmd, withexitstatus=1, logfile=logfile)
-cmd = "%s/bin/cloud-client.sh --run --name group --hours .25" % (cc_home)
+cmd = "%s/bin/cloud-client.sh --run --name %s --hours .25" % (cc_home, tst_image_name)
child = pexpect.spawn (cmd, timeout=to, maxread=20000, logfile=logfile)
rc = child.expect ('Running:')
if rc != 0:
- print "group not found in the list"
+ print "%s not found in the list" % (tst_image_name)
sys.exit(1)
handle = child.readline().strip().replace("'", "")
rc = child.expect(pexpect.EOF)
View
4 tests/cc-propsamename-test.py
@@ -19,11 +19,11 @@
cmd = "%s/bin/cloud-client.sh --transfer --sourcefile %s" % (cc_home, tst_image_src)
(x, rc)=pexpect.run(cmd, withexitstatus=1)
-cmd = "%s/bin/cloud-client.sh --run --name group --hours .25" % (cc_home)
+cmd = "%s/bin/cloud-client.sh --run --name %s --hours .25" % (cc_home, tst_image_name)
child = pexpect.spawn (cmd, timeout=to, maxread=20000, logfile=logfile)
rc = child.expect ('Running:')
if rc != 0:
- print "group not found in the list"
+ print "%s not found in the list" % (tst_image_name)
sys.exit(1)
handle = child.readline().strip().replace("'", "")
rc = child.expect(pexpect.EOF)
View
2  tests/cc-simple-network-test.py
@@ -17,7 +17,7 @@
child = pexpect.spawn (cmd, timeout=to, maxread=20000, logfile=logfile)
rc = child.expect ('Network')
if rc != 0:
- print "group not found in the list"
+ print "network not found in the list"
sys.exit(1)
line = child.readline()
ndx = line.find("public")
View
6 tests/cc-simple-security-test.py
@@ -12,15 +12,15 @@
child = pexpect.spawn (cmd, timeout=to, maxread=20000, logfile=logfile)
rc = child.expect ('Identity:')
if rc != 0:
- print "group not found in the list"
+ print "Identity: not found in the list"
sys.exit(1)
rc = child.expect ('Subject:')
if rc != 0:
- print "group not found in the list"
+ print "Subject: not found in the list"
sys.exit(1)
rc = child.expect ('Issuer:')
if rc != 0:
- print "group not found in the list"
+ print "Issuer: not found in the list"
sys.exit(1)
rc = child.expect(pexpect.EOF)
if rc != 0:
View
8 tests/cc-simple-status-test.py
@@ -13,11 +13,11 @@
cmd = "%s/bin/cloud-client.sh --transfer --sourcefile %s" % (cc_home, tst_image_src)
(x, rc)=pexpect.run(cmd, withexitstatus=1)
-cmd = "%s/bin/cloud-client.sh --run --name group --hours .25" % (cc_home)
+cmd = "%s/bin/cloud-client.sh --run --name %s --hours .25" % (cc_home, tst_image_name)
child = pexpect.spawn (cmd, timeout=to, maxread=20000, logfile=logfile)
rc = child.expect ('Running:')
if rc != 0:
- print "group not found in the list"
+ print "%s not found in the list" % (tst_image_name)
sys.exit(1)
handle = child.readline().strip().replace("'", "")
rc = child.expect(pexpect.EOF)
@@ -29,7 +29,7 @@
child = pexpect.spawn (cmd, timeout=to, maxread=20000, logfile=logfile)
rc = child.expect ('State:')
if rc != 0:
- print "group not found in the list"
+ print "%s not found in the list" % (tst_image_name)
sys.exit(1)
cmd = "%s/bin/cloud-client.sh --terminate --handle %s" % (cc_home, handle)
@@ -40,7 +40,7 @@
print "failed to terminate"
sys.exit(1)
-cmd = "%s/bin/cloud-client.sh --delete --name group" % (cc_home)
+cmd = "%s/bin/cloud-client.sh --delete --name %s" % (cc_home, tst_image_name)
print cmd
(x, rc)=pexpect.run(cmd, withexitstatus=1)
print x
View
2  tests/cc-submit-common-save-exists-test.py
@@ -24,7 +24,7 @@
child = pexpect.spawn (cmd, timeout=to, maxread=20000, logfile=logfile)
rc = child.expect ('Running:')
if rc != 0:
- print "group not found in the list"
+ print "Running not found in the list"
sys.exit(1)
handle = child.readline().strip().replace("'", "")
rc = child.expect(pexpect.EOF)
View
4 tests/cc-submit-common-save-submit-own.py
@@ -23,7 +23,7 @@
child = pexpect.spawn (cmd, timeout=to, maxread=20000, logfile=logfile)
rc = child.expect ('Running:')
if rc != 0:
- print "group not found in the list"
+ print "Running not found in the list"
sys.exit(1)
handle = child.readline().strip().replace("'", "")
rc = child.expect(pexpect.EOF)
@@ -44,7 +44,7 @@
child = pexpect.spawn (cmd, timeout=to, maxread=20000, logfile=logfile)
rc = child.expect ('Running:')
if rc != 0:
- print "group not found in the list"
+ print "Running not found in the list"
sys.exit(1)
handle = child.readline().strip().replace("'", "")
rc = child.expect(pexpect.EOF)
View
2  tests/cc-submit-common-test.py
@@ -23,7 +23,7 @@
child = pexpect.spawn (cmd, timeout=to, maxread=20000, logfile=logfile)
rc = child.expect ('Running:')
if rc != 0:
- print "group not found in the list"
+ print "Running not found in the list"
sys.exit(1)
handle = child.readline().strip().replace("'", "")
rc = child.expect(pexpect.EOF)
View
2  tests/cc-submit-common-unprop-size-test.py
@@ -28,7 +28,7 @@
child = pexpect.spawn (cmd, timeout=to, maxread=20000, logfile=logfile)
rc = child.expect ('Running:')
if rc != 0:
- print "group not found in the list"
+ print "Running not found in the list"
sys.exit(1)
handle = child.readline().strip().replace("'", "")
rc = child.expect(pexpect.EOF)
View
4 tests/cc-submit-test.py
@@ -13,11 +13,11 @@
cmd = "%s/bin/cloud-client.sh --transfer --sourcefile %s" % (cc_home, tst_image_src)
(x, rc)=pexpect.run(cmd, withexitstatus=1)
-cmd = "%s/bin/cloud-client.sh --run --name group --hours .25" % (cc_home)
+cmd = "%s/bin/cloud-client.sh --run --name %s --hours .25" % (cc_home, tst_image_name)
child = pexpect.spawn (cmd, timeout=to, maxread=20000, logfile=logfile)
rc = child.expect ('Running:')
if rc != 0:
- print "group not found in the list"
+ print "%s not found in the list" % (tst_image_name)
sys.exit(1)
handle = child.readline().strip().replace("'", "")
rc = child.expect(pexpect.EOF)
View
6 tests/cc-unprop-md5test.py
@@ -34,7 +34,7 @@
child = pexpect.spawn (cmd, timeout=to, maxread=20000, logfile=logfile)
rc = child.expect ('Running:')
if rc != 0:
- print "group not found in the list"
+ print "Running: not found in the list"
sys.exit(1)
handle = child.readline().strip().replace("'", "")
rc = child.expect(pexpect.EOF)
@@ -69,7 +69,7 @@
child = pexpect.spawn (cmd, timeout=to, maxread=20000, logfile=logfile)
rc = child.expect ('MD5 sum:')
if rc != 0:
- print "group not found in the list"
+ print "MD% sum not found in the list"
sys.exit(1)
sum1 = child.readline().strip()
rc = child.expect(pexpect.EOF)
@@ -81,7 +81,7 @@
child = pexpect.spawn (cmd, timeout=to, maxread=20000, logfile=logfile)
rc = child.expect ('MD5 sum:')
if rc != 0:
- print "group not found in the list"
+ print "MD5 not found in the list"
sys.exit(1)
sum2 = child.readline().strip()
rc = child.expect(pexpect.EOF)
View
2  tests/cc-unprop-readwrite-test.py
@@ -25,7 +25,7 @@
child = pexpect.spawn (cmd, timeout=to, maxread=20000, logfile=logfile)
rc = child.expect ('Running:')
if rc != 0:
- print "group not found in the list"
+ print "Running not found in the list"
sys.exit(1)
handle = child.readline().strip().replace("'", "")
rc = child.expect(pexpect.EOF)
View
2  tests/cc-unprop-size-test.py
@@ -26,7 +26,7 @@
child = pexpect.spawn (cmd, timeout=to, maxread=20000, logfile=logfile)
rc = child.expect ('Running:')
if rc != 0:
- print "group not found in the list"
+ print "Running not found in the list"
sys.exit(1)
handle = child.readline().strip().replace("'", "")
rc = child.expect(pexpect.EOF)
Please sign in to comment.
Something went wrong with that request. Please try again.