github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #47506 from zhangxiaoyu-zidif/replace-sliceequal-by-deepequal 

Automatic merge from submit-queue (batch tested with PRs 50693, 50831, 47506, 49119, 50871)

Use reflect.DeepEqual to replace slicesEqual

**What this PR does / why we need it**:

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes https://github.com/kubernetes/kubernetes/issues/50952

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
pull/6/head
Kubernetes Submit Queue 2017-08-21 14:30:00 -07:00 committed by GitHub
parent 0867802bbc f528bce5c6
commit 990395d5ea
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/util/mount/mount_linux_test.go
View File

@ -19,6 +19,7 @@ limitations under the License.
package mount package mount
import ( import (
"reflect"
"strings" "strings"
"testing" "testing"
) )
@ -75,24 +76,12 @@ func TestReadProcMountsFrom(t *testing.T) {
} }
func mountPointsEqual(a, b *MountPoint) bool { func mountPointsEqual(a, b *MountPoint) bool {
if a.Device != b.Device || a.Path != b.Path || a.Type != b.Type || !slicesEqual(a.Opts, b.Opts) || a.Pass != b.Pass || a.Freq != b.Freq { if a.Device != b.Device || a.Path != b.Path || a.Type != b.Type || !reflect.DeepEqual(a.Opts, b.Opts) || a.Pass != b.Pass || a.Freq != b.Freq {
return false return false
} }
return true return true
} }
func slicesEqual(a, b []string) bool {
if len(a) != len(b) {
return false
}
for i := range a {
if a[i] != b[i] {
return false
}
}
return true
}
func TestGetMountRefs(t *testing.T) { func TestGetMountRefs(t *testing.T) {
fm := &FakeMounter{ fm := &FakeMounter{
MountPoints: []MountPoint{ MountPoints: []MountPoint{