Use INTEGRATION_* instead of flavor-specific ENV vars

mtodd · mtodd · commit ec9021e0956f · 2014-11-14T14:26:18.000-08:00
diff --git a/test/support/vm/activedirectory/env.sh.example b/test/support/vm/activedirectory/env.sh.example
@@ -1,8 +1,8 @@
 # Copy this to ad-env.sh, and fill in with your own values
 
 export TESTENV=activedirectory
-export ACTIVEDIRECTORY_HOST=123.123.123.123
-export ACTIVEDIRECTORY_PORT=389
-export ACTIVEDIRECTORY_USER="CN=Administrator,CN=Users,DC=ad,DC=example,DC=com"
-export ACTIVEDIRECTORY_PASSWORD='passworD1'
-export ACTIVEDIRECTORY_SEARCH_DOMAINS='CN=Users,DC=ad,DC=ghe,DC=local'
+export INTEGRATION_HOST=123.123.123.123
+export INTEGRATION_PORT=389
+export INTEGRATION_USER="CN=Administrator,CN=Users,DC=ad,DC=example,DC=com"
+export INTEGRATION_PASSWORD='passworD1'
+export INTEGRATION_SEARCH_DOMAINS='CN=Users,DC=example,DC=com'
diff --git a/test/support/vm/activedirectory/reset-env.sh b/test/support/vm/activedirectory/reset-env.sh
@@ -1,6 +1,6 @@
 unset TESTENV
-unset ACTIVEDIRECTORY_HOST
-unset ACTIVEDIRECTORY_PORT
-unset ACTIVEDIRECTORY_USER
-unset ACTIVEDIRECTORY_PASSWORD
-unset ACTIVEDIRECTORY_SEARCH_DOMAINS
+unset INTEGRATION_HOST
+unset INTEGRATION_PORT
+unset INTEGRATION_USER
+unset INTEGRATION_PASSWORD
+unset INTEGRATION_SEARCH_DOMAINS
diff --git a/test/support/vm/openldap/README.md b/test/support/vm/openldap/README.md
@@ -16,10 +16,10 @@ $ ip=$(vagrant ssh -- "ifconfig eth1 | grep -o -E '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]
 $ cd ../../../..
 
 # run all tests against OpenLDAP
-$ time TESTENV=openldap OPENLDAP_HOST=$ip bundle exec rake
+$ time TESTENV=openldap INTEGRATION_HOST=$ip bundle exec rake
 
 # run a specific test file against OpenLDAP
-$ time TESTENV=openldap OPENLDAP_HOST=$ip bundle exec ruby test/membership_validators/recursive_test.rb
+$ time TESTENV=openldap INTEGRATION_HOST=$ip bundle exec ruby test/membership_validators/recursive_test.rb
 
 # run OpenLDAP tests by default
 $ export TESTENV=openldap
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -71,7 +71,7 @@ def options
           instrumentation_service: @service
       when "openldap"
         {
-          host: ENV.fetch("OPENLDAP_HOST", "localhost"),
+          host: ENV.fetch("INTEGRATION_HOST", "localhost"),
           port: 389,
           admin_user:     'uid=admin,dc=github,dc=com',
           admin_password: 'passworD1',
@@ -81,11 +81,11 @@ def options
         }
       when "activedirectory"
         {
-          host: ENV.fetch("ACTIVEDIRECTORY_HOST"),
-          port: ENV.fetch("ACTIVEDIRECTORY_PORT", 389),
-          admin_user: ENV.fetch("ACTIVEDIRECTORY_USER"),
-          admin_password: ENV.fetch("ACTIVEDIRECTORY_PASSWORD"),
-          search_domains: ENV.fetch("ACTIVEDIRECTORY_SEARCH_DOMAINS"),
+          host: ENV.fetch("INTEGRATION_HOST"),
+          port: ENV.fetch("INTEGRATION_PORT", 389),
+          admin_user: ENV.fetch("INTEGRATION_USER"),
+          admin_password: ENV.fetch("INTEGRATION_PASSWORD"),
+          search_domains: ENV.fetch("INTEGRATION_SEARCH_DOMAINS"),
           instrumentation_service: @service
         }
       end
