@@ -25,13 +25,13 @@ for test_dir in $test_dirs

 do

   go tool vet -shadow=false $test_dir

   if [ "$?" -ne 0 ]

-  then 

+  then

     FAILURE=true

   fi

 done

-# We don't want to exit on the first failure of go vet, so just keep track of 

-# whether a failure occured or not.

+# We don't want to exit on the first failure of go vet, so just keep track of

+# whether a failure occurred or not.

 if $FAILURE

 then

   echo "FAILURE: go vet failed!"

@@ -39,4 +39,4 @@ then

 else

   echo "SUCCESS: go vet succeded!"

   exit 0

-fi

\ No newline at end of file

+fi

@@ -106,7 +106,7 @@ func (l *LDAPClientConfig) Connect() (*ldap.Conn, error) {

 }

 // Bind binds to a given LDAP connection if a bind DN and password were given.

-// Bind returns whether a bind occured and whether an error occurred

+// Bind returns whether a bind occurred and whether an error occurred

 func (l *LDAPClientConfig) Bind(connection *ldap.Conn) (bound bool, err error) {

 	if len(l.BindDN) > 0 {

 		if err := connection.Bind(l.BindDN, l.BindPassword); err != nil {

@@ -76,7 +76,7 @@ func (o *ValidateMasterConfigOptions) Complete(args []string) error {

 }

 // Run runs the master config validation and returns the result of the validation as a boolean as well as any errors

-// that occured trying to validate the file

+// that occurred trying to validate the file

 func (o *ValidateMasterConfigOptions) Run() (bool, error) {

 	masterConfig, err := configapilatest.ReadAndResolveMasterConfig(o.MasterConfigFile)

 	if err != nil {

@@ -75,7 +75,7 @@ func (o *ValidateNodeConfigOptions) Complete(args []string) error {

 }

 // Run runs the node config validation and returns the result of the validation as a boolean as well as any errors

-// that occured trying to validate the file

+// that occurred trying to validate the file

 func (o *ValidateNodeConfigOptions) Run() (ok bool, err error) {

 	nodeConfig, err := configapilatest.ReadAndResolveNodeConfig(o.NodeConfigFile)

 	if err != nil {

@@ -49,7 +49,7 @@ func (c *DeployerPodController) Handle(pod *kapi.Pod) error {

 	// If the deployment for this pod has disappeared, we should clean up this

 	// and any other deployer pods, then bail out.

 	if err != nil {

-		// Some retrieval error occured. Retry.

+		// Some retrieval error occurred. Retry.

 		if !kerrors.IsNotFound(err) {

 			return fmt.Errorf("couldn't get deployment %s/%s which owns deployer pod %s/%s", pod.Namespace, deploymentName, pod.Name, pod.Namespace)

 		}

@@ -63,7 +63,7 @@ is_event_template=(               \

 )

 is_event_template=$(IFS=""; echo "${is_event_template[*]}") # re-formats template for use

-# wait until the last event that occured on the imagestream was the successful pull of the latest image

+# wait until the last event that occurred on the imagestream was the successful pull of the latest image

 wait_for_command 'oc get imagestream openldap --template="${is_event_template}" | grep latest' $((60*TIME_SEC))

 # kick off a build and wait for it to finish

@@ -86,7 +86,7 @@ server_ready_template=(                                  \

 server_ready_template=$(IFS=$""; echo "${server_ready_template[*]}") # re-formats template for use

 # wait for LDAP server to be ready

-wait_for_command 'oc get pods -l deploymentconfig=openldap-server --template="${server_ready_template}" | grep "ReadyTrue "' $((60*TIME_SEC)) 

+wait_for_command 'oc get pods -l deploymentconfig=openldap-server --template="${server_ready_template}" | grep "ReadyTrue "' $((60*TIME_SEC))

 # TODO(skuznets): readiness check is premature

 sleep 10

@@ -99,7 +99,7 @@ LDAP_SERVICE_IP=$(oc get --output-version=v1beta3 --template="{{ .spec.portalIP

 function compare_and_cleanup() {

 	validation_file=$1

 	actual_file=actual-${validation_file}.yaml

-	rm -f ${WORKINGDIR}/${actual_file} 

+	rm -f ${WORKINGDIR}/${actual_file}

 	oc get groups --no-headers | awk '{print $1}' | sort | xargs -I{} oc export group {} -o yaml >> ${WORKINGDIR}/${actual_file}

 	os::util::sed '/sync-time/d' ${WORKINGDIR}/${actual_file}

 	diff ${validation_file} ${WORKINGDIR}/${actual_file}

@@ -122,13 +122,13 @@ for (( i=0; i<${#schema[@]}; i++ )); do

 	WORKINGDIR=${BASETMPDIR}/${current_schema}

 	mkdir ${WORKINGDIR}

-	# create a temp copy of the test files 

+	# create a temp copy of the test files

 	cp test/extended/authentication/ldap/${current_schema}/* ${WORKINGDIR}

 	pushd ${WORKINGDIR} > /dev/null

 	# load OpenShift and LDAP group UIDs, needed for literal whitelists

 	# use awk instead of sed for compatibility (see os::util::sed)

-	group1_ldapuid=$(awk 'NR == 1 {print $0}' ldapgroupuids.txt) 

+	group1_ldapuid=$(awk 'NR == 1 {print $0}' ldapgroupuids.txt)

 	group2_ldapuid=$(awk 'NR == 2 {print $0}' ldapgroupuids.txt)

 	group3_ldapuid=$(awk 'NR == 3 {print $0}' ldapgroupuids.txt)

@@ -167,14 +167,14 @@ for (( i=0; i<${#schema[@]}; i++ )); do

 	oc patch group ${group1_osuid} -p 'users: []'

 	openshift ex sync-groups --type=openshift --whitelist=whitelist_openshift.txt --sync-config=sync-config.yaml --confirm

 	compare_and_cleanup valid_whitelist_sync.txt

-	

+

 	echo -e "\tTEST: Sync subset of OpenShift groups from LDAP server using literal whitelist"

 	# sync group from LDAP

 	openshift ex sync-groups ${group1_ldapuid} --sync-config=sync-config.yaml --confirm

 	oc patch group ${group1_osuid} -p 'users: []'

 	openshift ex sync-groups --type=openshift ${group1_osuid} --sync-config=sync-config.yaml --confirm

 	compare_and_cleanup valid_whitelist_sync.txt

-	

+

 	echo -e "\tTEST: Sync subset of OpenShift groups from LDAP server using union of literal whitelist and whitelist file"

 	# sync groups from LDAP

 	openshift ex sync-groups ${group1_ldapuid} ${group2_ldapuid} --sync-config=sync-config.yaml --confirm

@@ -182,7 +182,7 @@ for (( i=0; i<${#schema[@]}; i++ )); do

 	oc patch group ${group2_osuid} -p 'users: []'

 	openshift ex sync-groups --type=openshift group/${group2_osuid} --whitelist=whitelist_openshift.txt --sync-config=sync-config.yaml --confirm

 	compare_and_cleanup valid_whitelist_union_sync.txt

-	

+

 	# BLACKLISTS

 	echo -e "\tTEST: Sync subset of LDAP groups from LDAP server using whitelist and blacklist file"

@@ -201,7 +201,7 @@ for (( i=0; i<${#schema[@]}; i++ )); do

 	# openshift ex sync-groups --type=openshift --whitelist=osgroupuids.txt --blacklist=blacklist_openshift.txt --blacklist-group=${group1_osuid} --sync-config=sync-config.yaml --confirm

 	openshift ex sync-groups --type=openshift --whitelist=osgroupuids.txt --blacklist=blacklist_openshift.txt --sync-config=sync-config.yaml --confirm

 	compare_and_cleanup valid_all_openshift_blacklist_sync.txt

-	

+

 	# MAPPINGS

 	echo -e "\tTEST: Sync all LDAP groups from LDAP server using a user-defined mapping"

@@ -225,4 +225,4 @@ for (( i=0; i<${#schema[@]}; i++ )); do

 	compare_and_cleanup valid_all_ldap_sync_dn_everywhere.txt

     popd > /dev/null

-done

\ No newline at end of file

+done

@@ -301,7 +301,7 @@ func (c *CLI) Execute() error {

 	return err

 }

-// FatalErr exits the test in case a fatal error has occured.

+// FatalErr exits the test in case a fatal error has occurred.

 func FatalErr(msg interface{}) {

 	e2e.Failf("%v", msg)

 }