Refactored config parser tests

Author: asp24

glide.lock

@@ -13,3 +13,4 @@ import:
   version: ^0.8.0
   subpackages:
   - prometheus
+- package: github.com/otiai10/copy

glide.yaml

@@ -3,13 +3,21 @@ package phpfpm
 import (
 	"testing"
 
+	"github.com/otiai10/copy"
 	"github.com/stretchr/testify/assert"
+	"os"
 )
 
 func TestParse(t *testing.T) {
-	c, err := ParseConfig("testData/php-fpm.conf")
+	dir := "/tmp/fpm-test"
+	assert.NoError(t, os.Mkdir(dir, 0777))
+	copy.Copy("testdata", dir)
+
+	defer os.RemoveAll(dir)
+
+	c, err := ParseConfig(dir + "/php-fpm.conf")
 	assert.Nil(t, err)
-	assert.Equal(t, "testData/php-fpm.d/*.conf", c.Include)
+	assert.Equal(t, dir + "/php-fpm.d/*.conf", c.Include)
 
 	assert.Equal(t, "www", c.Pools[0].Name)
 	assert.Equal(t, "/run/php-fpm/php-fpm.sock", c.Pools[0].Listen)

pkg/phpfpm/config_test.go

@@ -122,4 +122,4 @@ error_log = syslog
 ; Relative path can also be used. They will be prefixed by:
 ;  - the global prefix if it's been set (-p argument)
 ;  - /usr otherwise
-include=testData/php-fpm.d/*.conf
+include=/tmp/fpm-test/php-fpm.d/*.conf

fpmConfig/testData/php-fpm.conf renamed to pkg/phpfpm/testdata/php-fpm.conf

@@ -44,8 +44,8 @@ listen = /run/php-fpm/php-fpm.sock
 ; BSD-derived systems allow connections regardless of permissions.
 ; Default Values: user and group are set as the running user
 ;                 mode is set to 0660
-listen.owner = http
-listen.group = http
+;listen.owner = http
+;listen.group = http
 listen.mode = 0666
 ; When POSIX Access Control Lists are supported you can set them using
 ; these options, value is a comma separated list of user/group names.