test: improve tests on Windows

Signed-off-by: Santiago M. Mola <[email protected]>

Author: smola

cmd/siva/list_test.go

@@ -3,6 +3,7 @@ package main
 import (
 	"bytes"
 	"os"
+	"path/filepath"
 
 	. "gopkg.in/check.v1"
 )
@@ -15,7 +16,7 @@ var _ = Suite(&ListSuite{})
 
 func (s *ListSuite) TestBasic(c *C) {
 	cmd := &CmdList{}
-	cmd.Args.File = "../../fixtures/perms.siva"
+	cmd.Args.File = filepath.Join("..", "..", "fixtures", "perms.siva")
 
 	output := captureOutput(func() {
 		err := cmd.Execute(nil)

cmd/siva/pack_test.go

@@ -23,7 +23,7 @@ var _ = Suite(&PackSuite{})
 
 func (s *PackSuite) SetUpTest(c *C) {
 	var err error
-	s.folder, err = ioutil.TempDir("/tmp/", "siva-cmd-pack")
+	s.folder, err = ioutil.TempDir(os.TempDir(), "siva-cmd-pack")
 	c.Assert(err, IsNil)
 
 	err = os.Mkdir(filepath.Join(s.folder, "files"), 0766)

cmd/siva/unpack_test.go

@@ -16,7 +16,7 @@ var _ = Suite(&UnpackSuite{})
 
 func (s *UnpackSuite) SetUpTest(c *C) {
 	var err error
-	s.folder, err = ioutil.TempDir("/tmp/", "siva-cmd-unpack")
+	s.folder, err = ioutil.TempDir(os.TempDir(), "siva-cmd-unpack")
 	c.Assert(err, IsNil)
 }
 
@@ -28,7 +28,7 @@ func (s *UnpackSuite) TearDownTest(c *C) {
 func (s *UnpackSuite) TestBasic(c *C) {
 	cmd := &CmdUnpack{}
 	cmd.Output.Path = filepath.Join(s.folder, "files")
-	cmd.Args.File = "../../fixtures/perms.siva"
+	cmd.Args.File = filepath.Join("..", "..", "fixtures", "perms.siva")
 	cmd.Overwrite = true
 
 	err := cmd.Execute(nil)
@@ -52,7 +52,7 @@ func (s *UnpackSuite) TestBasic(c *C) {
 func (s *UnpackSuite) TestIgnorePerms(c *C) {
 	cmd := &CmdUnpack{}
 	cmd.Output.Path = filepath.Join(s.folder, "files")
-	cmd.Args.File = "../../fixtures/perms.siva"
+	cmd.Args.File = filepath.Join("..", "..", "fixtures", "perms.siva")
 	cmd.IgnorePerms = true
 
 	err := cmd.Execute(nil)
@@ -70,7 +70,7 @@ func (s *UnpackSuite) TestIgnorePerms(c *C) {
 func (s *UnpackSuite) TestMatch(c *C) {
 	cmd := &CmdUnpack{}
 	cmd.Output.Path = filepath.Join(s.folder, "files")
-	cmd.Args.File = "../../fixtures/basic.siva"
+	cmd.Args.File = filepath.Join("..", "..", "fixtures", "basic.siva")
 	cmd.Match = "gopher(.*)"
 
 	err := cmd.Execute(nil)
@@ -85,7 +85,7 @@ func (s *UnpackSuite) TestMatch(c *C) {
 func (s *UnpackSuite) TestOverwrite(c *C) {
 	cmd := &CmdUnpack{}
 	cmd.Output.Path = filepath.Join(s.folder, "files")
-	cmd.Args.File = "../../fixtures/duplicate.siva"
+	cmd.Args.File = filepath.Join("..", "..", "fixtures", "duplicate.siva")
 	cmd.Overwrite = true
 
 	err := cmd.Execute(nil)
@@ -98,8 +98,8 @@ func (s *UnpackSuite) TestOverwrite(c *C) {
 
 func (s *UnpackSuite) TestZipSlip(c *C) {
 	cmd := &CmdUnpack{}
-	cmd.Output.Path = filepath.Join(s.folder, "files/inside")
-	cmd.Args.File = "../../fixtures/zipslip.siva"
+	cmd.Output.Path = filepath.Join(s.folder, "files", "inside")
+	cmd.Args.File = filepath.Join("..", "..", "fixtures", "zipslip.siva")
 
 	err := cmd.Execute(nil)
 	c.Assert(err, NotNil)