43 lines
1.2 KiB
Diff
43 lines
1.2 KiB
Diff
From d64e9611109b2eb6de42a47d497cba313252a838 Mon Sep 17 00:00:00 2001
|
|
From: Anthony Fok <foka@debian.org>
|
|
Date: Wed, 2 Oct 2019 23:40:22 -0600
|
|
Subject: [PATCH] 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.
|
|
---
|
|
resources/image_test.go | 11 +++--------
|
|
1 file changed, 3 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/resources/image_test.go b/resources/image_test.go
|
|
index 5fa5021c95..169f19522e 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))
|
|
|