Apply necessary fixes for failing travis ci build

Author: Sazon, John Bryan J

.travis.yml

@@ -16,13 +16,12 @@ services:
 before_install:
   - docker-compose up -d
   - |
-    jq --version
 
-    source testdata/credentials.sh
+    jq --version
 
     ctr=0
     max_retries=30
-    while [ $(curl -I -u "${GITLAB_USERNAME}:${GITLAB_PASSWORD}" ${GITLAB_HTTP_URL}/users/sign_in | head -1 | grep 200 | wc -l | tr -d ' ') -ne 1 ]; do
+    while [ $(curl -I -u "root:123qwe123" http://localhost:10080/users/sign_in | head -1 | grep 200 | wc -l | tr -d ' ') -ne 1 ]; do
       ctr=`expr $ctr + 1`
       echo waiting for gitlab to come up
       sleep 10
@@ -31,17 +30,34 @@ before_install:
         exit 1
       fi
     done
-    echo "============ setting up test data ============="
+
+    ###################################################
+    # WARM UP TIME (don't mind me)
+    ###################################################
+    sleep_time=100
+    echo "sleeping for ${sleep_time} seconds"
+    sleep ${sleep_time}
+    source testdata/credentials.sh
     env | grep GITLAB
+    ###################################################
+
+    echo "============ setting up test data ============="
     GITLAB_USERNAME=$GITLAB_USERNAME GITLAB_PASSWORD=$GITLAB_PASSWORD GITLAB_HTTP_URL=$GITLAB_HTTP_URL ./testdata/seeder.sh
     echo "============ test data completed  ============="
+  - go get github.com/golang/lint/golint
+  - make getdep
 
 script:
-  - go get github.com/golang/lint/golint
   - golint -set_exit_status ./...
   - |
     source testdata/credentials.sh
-    make coverage
+    go run main.go get users
+    go run main.go get groups
+    go run main.go get projects
+    travis_wait 30 make coverage
+
+after_script:
+  - sleep 1
 
 after_success:
   - bash <(curl -s https://codecov.io/bash) # Set CODECOV_TOKEN in your environment variables.

Makefile

@@ -41,7 +41,8 @@ test: getdep
 	go test -v ./... -failfast
 
 coverage: getdep
-	go test -v ./... -failfast -race -coverprofile=coverage.txt -covermode=atomic
+	rm -f ~/.gitlabctl.yaml
+	go test -cpu=1 -v ./... -failfast -coverprofile=coverage.txt -covermode=count
 
 getdep:
 	go get -v ./...

cmd/completion_test.go

@@ -22,8 +22,6 @@ package cmd
 
 import (
 	"testing"
-
-	"github.com/stretchr/testify/require"
 )
 
 func TestCompletion(t *testing.T) {
@@ -65,8 +63,7 @@ func TestCompletion(t *testing.T) {
 				noParent: true,
 			}
 			stdout, execResult := execT.executeCommand()
-			require.Equal(t, tc.expect, execResult,
-				printFlagsTable(tc.flagsMap, stdout))
+			assertEqualResult(t, execResult, tc.expect, printFlagsTable(tc.flagsMap, stdout))
 		})
 	}
 }

cmd/delete_project_hook_test.go

@@ -37,7 +37,6 @@ func TestDeleteProjectHook(t *testing.T) {
 	}{
 		{
 			name: "successfully delete a project hook",
-			args: []string{""}, // to be filled in test setup
 			flagsMap: map[string]string{
 				"project": "23",
 			},
@@ -65,7 +64,7 @@ func TestDeleteProjectHook(t *testing.T) {
 				if err != nil {
 					tInfo(fmt.Sprintf("failed to create project hook %s", tc.args[0]))
 				}
-				tc.args[0] = strconv.Itoa(hook.ID)
+				tc.args = append(tc.args, strconv.Itoa(hook.ID))
 			}
 
 			execT := execTestCmdFlags{

cmd/edit_project_hook_test.go

@@ -21,8 +21,6 @@ package cmd
 
 import (
 	"testing"
-
-	"github.com/stretchr/testify/require"
 )
 
 func TestEditProjectHook(t *testing.T) {
@@ -83,8 +81,7 @@ func TestEditProjectHook(t *testing.T) {
 				args:     tc.args,
 			}
 			stdout, execResult := execT.executeCommand()
-			require.Equal(t, tc.expect, execResult,
-				printFlagsTable(tc.flagsMap, stdout))
+			assertEqualResult(t, execResult, tc.expect, printFlagsTable(tc.flagsMap, stdout))
 		})
 	}
 }

cmd/gitlab_client_test.go

@@ -4,7 +4,6 @@ import (
 	"os"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
 	gitlab "github.com/xanzy/go-gitlab"
 )
 
@@ -74,15 +73,17 @@ func TestGitlabNewClient(t *testing.T) {
 		// Run the test
 		t.Run(tc.name, func(t *testing.T) {
 			gitlabClient, err := newGitlabClient()
-			if tc.negativeTest {
-				tInfo(err)
-				assert.NotNil(t, err)
-			} else {
-				assert.Nil(t, err)
+			if err != nil && !tc.negativeTest {
+				t.Fatalf("gitlab client test is expected to pass: %+v", err)
+			}
+			if err == nil && tc.negativeTest {
+				t.Fatalf("gitlab client test is expected to fail: %+v", err)
 			}
 			if !tc.negativeTest {
 				_, _, err = gitlabClient.Users.ListUsers(&gitlab.ListUsersOptions{})
-				assert.Nil(t, err)
+				if err != nil {
+					t.Fatalf("gitlab client test is expected to pass: %+v", err)
+				}
 			}
 		})
 	}

docs/gitlabctl_delete.md

@@ -21,7 +21,7 @@ Delete a Gitlab resource
 ### SEE ALSO
 
 * [gitlabctl](gitlabctl.md)	 - Gitlab command-line interface
-* [gitlabctl delete all-members](gitlabctl_delete_all-members.md)	 - Delete all members(except creator) of a project
+* [gitlabctl delete all-members](gitlabctl_delete_all-members.md)	 - Delete all members of a project
 * [gitlabctl delete branch](gitlabctl_delete_branch.md)	 - Delete a project branch
 * [gitlabctl delete group](gitlabctl_delete_group.md)	 - Delete a Gitlab group by specifying the id or group path
 * [gitlabctl delete member](gitlabctl_delete_member.md)	 - Delete a member by specifying the member name as the first argument

docs/gitlabctl_delete_all-members.md

@@ -1,10 +1,10 @@
 ## gitlabctl delete all-members
 
-Delete all members(except creator) of a project
+Delete all members of a project
 
 ### Synopsis
 
-Delete all members(except creator) of a project
+Delete all members of a project
 
 ```
 gitlabctl delete all-members [flags]
@@ -13,7 +13,6 @@ gitlabctl delete all-members [flags]
 ### Examples
 
 ```
-# remove all members(except creator) from a project
 gitlabctl delete all-members --from-project Group1/Project1
 ```
 

testdata/credentials.sh

@@ -1,3 +1,5 @@
+#!/bin/bash -e
+
 export GITLAB_USERNAME=root
 export GITLAB_PASSWORD=123qwe123
 export GITLAB_HTTP_URL=${GITLAB_HTTP_URL:-http://localhost:10080}

testdata/seeder.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -ex
+#!/bin/bash -e
 
 echo "=============================================="
 echo "#              SEEDER SCRIPT                 #"
@@ -42,6 +42,9 @@ sgroup2_id=$(curl -X POST "${GITLAB_HTTP_URL}/api/v4/groups?access_token=${acces
 sgroup3_id=$(curl -X POST "${GITLAB_HTTP_URL}/api/v4/groups?access_token=${access_token}&name=SubGroup3&path=SubGroup3&parent_id=${pgroup2_id}" | jq '.id')
 sgroup4_id=$(curl -X POST "${GITLAB_HTTP_URL}/api/v4/groups?access_token=${access_token}&name=SubGroup4&path=SubGroup4&parent_id=${pgroup2_id}" | jq '.id')
 
+echo sleeping for 5 seconds..
+sleep 5
+
 # create group project
 echo "Creating a project in group/subgroup"
 groupproject1_id=$(curl -X POST "${GITLAB_HTTP_URL}/api/v4/projects?access_token=${access_token}&name=Project1&namespace_id=${pgroup1_id}" | jq '.id')