Skip to content
Permalink
Browse files

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.
  • Loading branch information...
anthonyfok authored and bep committed Oct 3, 2019
1 parent 019ae38 commit 298092d516f623cc20051f506d460fb7625cdc84
Showing with 3 additions and 8 deletions.
  1. +3 −8 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))

0 comments on commit 298092d

Please sign in to comment.
You can’t perform that action at this time.