Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

allow real tests to set the CA name path

  • Loading branch information...
commit 68fae2931427263e9555ee08c39934ea7706ba74 1 parent ebdef24
John Bresnahan buzztroll authored
4 tests/cc-nimbusAdminList-test.py
View
@@ -5,6 +5,8 @@
import os
import re
+tst_ca = os.environ['NIMBUS_TEST_CA']
+
to=int(os.environ["NIMBUS_TEST_TIMEOUT"])
tst_image_name = os.environ['NIMBUS_TEST_IMAGE']
tst_image_src = os.environ['NIMBUS_SOURCE_TEST_IMAGE']
@@ -47,7 +49,7 @@
print "error"
sys.exit(1)
-cmd = "%s/bin/nimbus-admin --list --dn /O=Auto/OU=CA/CN=%s" % (nimbus_home, nimbus_user)
+cmd = "%s/bin/nimbus-admin --list --dn %s/CN=%s" % (nimbus_home, tst_ca, nimbus_user)
print cmd
(x, rc)=pexpect.run(cmd, withexitstatus=1, timeout=to)
print x
4 tests/cc-nimbusAdminShutdown-test.py
View
@@ -9,6 +9,8 @@
tst_image_name = os.environ['NIMBUS_TEST_IMAGE']
tst_image_src = os.environ['NIMBUS_SOURCE_TEST_IMAGE']
+tst_ca = os.environ['NIMBUS_TEST_CA']
+
cc_home=os.environ['CLOUD_CLIENT_HOME']
nimbus_home=os.environ['NIMBUS_HOME']
nimbus_user=os.environ['NIMBUS_TEST_USER']
@@ -88,7 +90,7 @@ def assert_vms():
assert_vms()
# Shutdown started VM
-cmd = "%s/bin/nimbus-admin --shutdown --dn /O=Auto/OU=CA/CN=%s" % (nimbus_home, nimbus_user)
+cmd = "%s/bin/nimbus-admin --shutdown --dn %s/CN=%s" % (nimbus_home, tst_ca, nimbus_user)
print cmd
(x, rc)=pexpect.run(cmd, withexitstatus=1, logfile=logfile, timeout=to)
print x
4 tests/make-test-env.sh
View
@@ -287,12 +287,15 @@ cp $src_dir/public $install_dir/services/etc/nimbus/workspace-service/network-p
echo $work_dir
export NIMBUS_TEST_USER=$user_name
+export NIMBUS_TEST_CA="/O=Auto/OU=CA"
+
echo "Your test environment is:"
echo "NIMBUS_HOME: $NIMBUS_HOME"
echo "NIMBUS_TEST_USER: $NIMBUS_TEST_USER"
echo "CLOUD_CLIENT_HOME: $CLOUD_CLIENT_HOME"
echo "NIMBUS_WORKSPACE_CONTROL_HOME: $NIMBUS_WORKSPACE_CONTROL_HOME"
echo "NIMBUS_TEST_USER_CAN_ID: $can_id"
+echo "NIMBUS_TEST_CA: $NIMBUS_TEST_CA"
echo "export NIMBUS_HOME=$NIMBUS_HOME" > $src_dir/env.sh
@@ -303,4 +306,5 @@ echo "export NIMBUS_TEST_USER_CAN_ID=$can_id" >> $src_dir/env.sh
echo "export NIMBUS_TEST_IMAGE=group" >> $src_dir/env.sh
echo "export NIMBUS_SOURCE_TEST_IMAGE=/etc/group" >> $src_dir/env.sh
echo "export NIMBUS_TEST_TIMEOUT=90" >> $src_dir/env.sh
+echo "export NIMBUS_TEST_CA=$NIMBUS_TEST_CA" >> $src_dir/env.sh
Please sign in to comment.
Something went wrong with that request. Please try again.