From: Anthony Fok <foka@debian.org>
Date: Thu, 3 Oct 2019 05:40:22 +0000 (-0600)
Subject: resources: Ensure same dirinfos sort order in TestImageOperationsGolden
X-Git-Tag: v0.59.0~35
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=298092d516f623cc20051f506d460fb7625cdc84;p=brevno-suite%2Fhugo

resources: Ensure same dirinfos sort order in TestImageOperationsGolden

Fix filename mismatch errors on Debian auto-building machines
possibly due to different directory order on ext4 vs tmpfs file systems.
---

diff --git a/resources/image_test.go b/resources/image_test.go
index 5fa5021c..169f1952 100644
--- a/resources/image_test.go
+++ b/resources/image_test.go
@@ -15,6 +15,7 @@ package resources
 
 import (
 	"fmt"
+	"io/ioutil"
 	"math/big"
 	"math/rand"
 	"os"
@@ -567,15 +568,9 @@ func TestImageOperationsGolden(t *testing.T) {
 	dir2 := filepath.FromSlash("testdata/golden")
 
 	// The two dirs above should now be the same.
-	d1, err := os.Open(dir1)
+	dirinfos1, err := ioutil.ReadDir(dir1)
 	c.Assert(err, qt.IsNil)
-	d2, err := os.Open(dir2)
-	c.Assert(err, qt.IsNil)
-
-	dirinfos1, err := d1.Readdir(-1)
-	c.Assert(err, qt.IsNil)
-	dirinfos2, err := d2.Readdir(-1)
-
+	dirinfos2, err := ioutil.ReadDir(dir2)
 	c.Assert(err, qt.IsNil)
 	c.Assert(len(dirinfos1), qt.Equals, len(dirinfos2))