Merge pull request #58 from roidelapluie/acct

Run ACC tests

Author: roidelapluie

.travis.yml

@@ -5,6 +5,9 @@ services:
 language: go
 go:
   - "1.11.x"
+env:
+  GITLAB_BASE_URL: http://127.0.0.1:8080/api/v4
+  GITLAB_TOKEN: ACCTEST
 
 install:
 # This script is used by the Travis build to install a cookie for
@@ -13,9 +16,11 @@ install:
 # See: https://github.com/golang/go/issues/12933
 - bash scripts/gogetcookie.sh
 - go get github.com/kardianos/govendor
+- bash scripts/start-gitlab.sh
 
 script:
 - make test
+- make testacc
 - make vendor-status
 - make vet
 - make website-test

gitlab/resource_gitlab_group.go

@@ -3,7 +3,9 @@ package gitlab
 import (
 	"fmt"
 	"log"
+	"time"
 
+	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
 	gitlab "github.com/xanzy/go-gitlab"
@@ -167,5 +169,35 @@ func resourceGitlabGroupDelete(d *schema.ResourceData, meta interface{}) error {
 	log.Printf("[DEBUG] Delete gitlab group %s", d.Id())
 
 	_, err := client.Groups.DeleteGroup(d.Id())
+	if err != nil {
+		return fmt.Errorf("error deleting group %s: %s", d.Id(), err)
+	}
+
+	// Wait for the group to be deleted.
+	// Deleting a group in gitlab is async.
+	stateConf := &resource.StateChangeConf{
+		Pending: []string{"Deleting"},
+		Target:  []string{"Deleted"},
+		Refresh: func() (interface{}, string, error) {
+			out, response, err := client.Groups.GetGroup(d.Id())
+			if err != nil {
+				if response.StatusCode == 404 {
+					return out, "Deleted", nil
+				}
+				log.Printf("[ERROR] Received error: %#v", err)
+				return out, "Error", err
+			}
+			return out, "Deleting", nil
+		},
+
+		Timeout:    10 * time.Minute,
+		MinTimeout: 3 * time.Second,
+		Delay:      5 * time.Second,
+	}
+
+	_, err = stateConf.WaitForState()
+	if err != nil {
+		return fmt.Errorf("error waiting for group (%s) to become deleted: %s", d.Id(), err)
+	}
 	return err
 }

scripts/start-gitlab.sh

@@ -0,0 +1,15 @@
+#!/bin/bash -e
+echo "Starting gitlab container..."
+docker run -d -e GITLAB_ROOT_PASSWORD=adminadmin --rm -p 127.0.0.1:8080:80 --name gitlab gitlab/gitlab-ce
+echo -n "Waiting for gitlab to be ready "
+i=1
+until wget -t 1 127.0.0.1:8080 -O /dev/null -q 
+do
+    sleep 1
+    echo -n .
+    if [[ $((i%3)) == 0 ]]; then echo -n ' '; fi
+    let i++
+done
+echo
+echo "Creating access token"
+echo 'PersonalAccessToken.create(user_id: 1, scopes: [:api, :read_user], name: :terraform, token: :ACCTEST).save!' | docker exec -i gitlab gitlab-rails console