[lxc-devel] [lxd/master] Rename idmapset_test_linux.go to idmapset_linux_test.go

[vahe on Github]

From 61c1675990cbd06d38137e139ce58d36b6c4ddb7 Mon Sep 17 00:00:00 2001
From: Vahe Khachikyan <***@live.ca>
Date: Tue, 20 Dec 2016 14:02:36 -0500
Subject: [PATCH] Rename idmapset_test_linux.go to idmapset_linux_test.go

Signed-off-by: Vahe Khachikyan <***@live.ca>
---
shared/idmapset_linux_test.go | 92 +++++++++++++++++++++++++++++++++++++++++++
shared/idmapset_test_linux.go | 92 -------------------------------------------
2 files changed, 92 insertions(+), 92 deletions(-)
create mode 100644 shared/idmapset_linux_test.go
delete mode 100644 shared/idmapset_test_linux.go

diff --git a/shared/idmapset_linux_test.go b/shared/idmapset_linux_test.go
new file mode 100644
index 0000000..448086e
--- /dev/null
+++ b/shared/idmapset_linux_test.go
@@ -0,0 +1,92 @@
+package shared
+
+import (
+ "fmt"
+ "testing"
+)
+
+func TestIdmapSetAddSafe_split(t *testing.T) {
+ orig := IdmapSet{Idmap: []IdmapEntry{IdmapEntry{Isuid: true, Hostid: 1000, Nsid: 0, Maprange: 1000}}}
+
+ if err := orig.AddSafe(IdmapEntry{Isuid: true, Hostid: 500, Nsid: 500, Maprange: 10}); err != nil {
+ t.Error(err)
+ return
+ }
+
+ if orig.Idmap[0].Hostid != 1000 || orig.Idmap[0].Nsid != 0 || orig.Idmap[0].Maprange != 500 {
+ t.Error(fmt.Errorf("bad range: %v", orig.Idmap[0]))
+ return
+ }
+
+ if orig.Idmap[1].Hostid != 500 || orig.Idmap[1].Nsid != 500 || orig.Idmap[1].Maprange != 10 {
+ t.Error(fmt.Errorf("bad range: %v", orig.Idmap[1]))
+ return
+ }
+
+ if orig.Idmap[2].Hostid != 1510 || orig.Idmap[2].Nsid != 510 || orig.Idmap[2].Maprange != 490 {
+ t.Error(fmt.Errorf("bad range: %v", orig.Idmap[2]))
+ return
+ }
+
+ if len(orig.Idmap) != 3 {
+ t.Error("too many idmap entries")
+ return
+ }
+}
+
+func TestIdmapSetAddSafe_lower(t *testing.T) {
+ orig := IdmapSet{Idmap: []IdmapEntry{IdmapEntry{Isuid: true, Hostid: 1000, Nsid: 0, Maprange: 1000}}}
+
+ if err := orig.AddSafe(IdmapEntry{Isuid: true, Hostid: 500, Nsid: 0, Maprange: 10}); err != nil {
+ t.Error(err)
+ return
+ }
+
+ if orig.Idmap[0].Hostid != 500 || orig.Idmap[0].Nsid != 0 || orig.Idmap[0].Maprange != 10 {
+ t.Error(fmt.Errorf("bad range: %v", orig.Idmap[0]))
+ return
+ }
+
+ if orig.Idmap[1].Hostid != 1010 || orig.Idmap[1].Nsid != 10 || orig.Idmap[1].Maprange != 990 {
+ t.Error(fmt.Errorf("bad range: %v", orig.Idmap[1]))
+ return
+ }
+
+ if len(orig.Idmap) != 2 {
+ t.Error("too many idmap entries")
+ return
+ }
+}
+
+func TestIdmapSetAddSafe_upper(t *testing.T) {
+ orig := IdmapSet{Idmap: []IdmapEntry{IdmapEntry{Isuid: true, Hostid: 1000, Nsid: 0, Maprange: 1000}}}
+
+ if err := orig.AddSafe(IdmapEntry{Isuid: true, Hostid: 500, Nsid: 995, Maprange: 10}); err != nil {
+ t.Error(err)
+ return
+ }
+
+ if orig.Idmap[0].Hostid != 1000 || orig.Idmap[0].Nsid != 0 || orig.Idmap[0].Maprange != 995 {
+ t.Error(fmt.Errorf("bad range: %v", orig.Idmap[0]))
+ return
+ }
+
+ if orig.Idmap[1].Hostid != 500 || orig.Idmap[1].Nsid != 995 || orig.Idmap[1].Maprange != 10 {
+ t.Error(fmt.Errorf("bad range: %v", orig.Idmap[1]))
+ return
+ }
+
+ if len(orig.Idmap) != 2 {
+ t.Error("too many idmap entries")
+ return
+ }
+}
+
+func TestIdmapSetIntersects(t *testing.T) {
+ orig := IdmapSet{Idmap: []IdmapEntry{IdmapEntry{Isuid: true, Hostid: 165536, Nsid: 0, Maprange: 65536}}}
+
+ if orig.Intersects(IdmapEntry{Isuid: true, Hostid: 231072, Nsid: 0, Maprange: 65536}) {
+ t.Error("ranges don't intersect")
+ return
+ }
+}
diff --git a/shared/idmapset_test_linux.go b/shared/idmapset_test_linux.go
deleted file mode 100644
index 448086e..0000000
--- a/shared/idmapset_test_linux.go
+++ /dev/null
@@ -1,92 +0,0 @@
-package shared
-
-import (
- "fmt"
- "testing"
-)
-
-func TestIdmapSetAddSafe_split(t *testing.T) {
- orig := IdmapSet{Idmap: []IdmapEntry{IdmapEntry{Isuid: true, Hostid: 1000, Nsid: 0, Maprange: 1000}}}
-
- if err := orig.AddSafe(IdmapEntry{Isuid: true, Hostid: 500, Nsid: 500, Maprange: 10}); err != nil {
- t.Error(err)
- return
- }
-
- if orig.Idmap[0].Hostid != 1000 || orig.Idmap[0].Nsid != 0 || orig.Idmap[0].Maprange != 500 {
- t.Error(fmt.Errorf("bad range: %v", orig.Idmap[0]))
- return
- }
-
- if orig.Idmap[1].Hostid != 500 || orig.Idmap[1].Nsid != 500 || orig.Idmap[1].Maprange != 10 {
- t.Error(fmt.Errorf("bad range: %v", orig.Idmap[1]))
- return
- }
-
- if orig.Idmap[2].Hostid != 1510 || orig.Idmap[2].Nsid != 510 || orig.Idmap[2].Maprange != 490 {
- t.Error(fmt.Errorf("bad range: %v", orig.Idmap[2]))
- return
- }
-
- if len(orig.Idmap) != 3 {
- t.Error("too many idmap entries")
- return
- }
-}
-
-func TestIdmapSetAddSafe_lower(t *testing.T) {
- orig := IdmapSet{Idmap: []IdmapEntry{IdmapEntry{Isuid: true, Hostid: 1000, Nsid: 0, Maprange: 1000}}}
-
- if err := orig.AddSafe(IdmapEntry{Isuid: true, Hostid: 500, Nsid: 0, Maprange: 10}); err != nil {
- t.Error(err)
- return
- }
-
- if orig.Idmap[0].Hostid != 500 || orig.Idmap[0].Nsid != 0 || orig.Idmap[0].Maprange != 10 {
- t.Error(fmt.Errorf("bad range: %v", orig.Idmap[0]))
- return
- }
-
- if orig.Idmap[1].Hostid != 1010 || orig.Idmap[1].Nsid != 10 || orig.Idmap[1].Maprange != 990 {
- t.Error(fmt.Errorf("bad range: %v", orig.Idmap[1]))
- return
- }
-
- if len(orig.Idmap) != 2 {
- t.Error("too many idmap entries")
- return
- }
-}
-
-func TestIdmapSetAddSafe_upper(t *testing.T) {
- orig := IdmapSet{Idmap: []IdmapEntry{IdmapEntry{Isuid: true, Hostid: 1000, Nsid: 0, Maprange: 1000}}}
-
- if err := orig.AddSafe(IdmapEntry{Isuid: true, Hostid: 500, Nsid: 995, Maprange: 10}); err != nil {
- t.Error(err)
- return
- }
-
- if orig.Idmap[0].Hostid != 1000 || orig.Idmap[0].Nsid != 0 || orig.Idmap[0].Maprange != 995 {
- t.Error(fmt.Errorf("bad range: %v", orig.Idmap[0]))
- return
- }
-
- if orig.Idmap[1].Hostid != 500 || orig.Idmap[1].Nsid != 995 || orig.Idmap[1].Maprange != 10 {
- t.Error(fmt.Errorf("bad range: %v", orig.Idmap[1]))
- return
- }
-
- if len(orig.Idmap) != 2 {
- t.Error("too many idmap entries")
- return
- }
-}
-
-func TestIdmapSetIntersects(t *testing.T) {
- orig := IdmapSet{Idmap: []IdmapEntry{IdmapEntry{Isuid: true, Hostid: 165536, Nsid: 0, Maprange: 65536}}}
-
- if orig.Intersects(IdmapEntry{Isuid: true, Hostid: 231072, Nsid: 0, Maprange: 65536}) {
- t.Error("ranges don't intersect")
- return
- }
-}