summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorIan Gudger <igudger@google.com>2018-05-04 14:15:24 -0700
committerShentubot <shentubot@google.com>2018-05-04 14:16:11 -0700
commitf47174f06b9904b830268d46a7e817053b6235c8 (patch)
tree15d932f4a27877122d433226346c266d222a96f8
parent0ce9c81b416494e3c3da793c278dfc767341fa6d (diff)
Run gofmt -s on everything
PiperOrigin-RevId: 195469901 Change-Id: I66d5c7a334bbb8b47e40d266a2661291c2d91c7f
-rw-r--r--pkg/sentry/control/proc_test.go8
-rw-r--r--pkg/sentry/kernel/semaphore/semaphore_test.go8
-rw-r--r--runsc/fsgofer/fsgofer.go4
-rw-r--r--runsc/fsgofer/fsgofer_test.go8
-rw-r--r--runsc/sandbox/sandbox.go4
5 files changed, 16 insertions, 16 deletions
diff --git a/pkg/sentry/control/proc_test.go b/pkg/sentry/control/proc_test.go
index 18286496f..22c826236 100644
--- a/pkg/sentry/control/proc_test.go
+++ b/pkg/sentry/control/proc_test.go
@@ -38,7 +38,7 @@ func TestProcessListTable(t *testing.T) {
},
{
pl: []*Process{
- &Process{
+ {
UID: 0,
PID: 0,
PPID: 0,
@@ -47,7 +47,7 @@ func TestProcessListTable(t *testing.T) {
Time: "0",
Cmd: "zero",
},
- &Process{
+ {
UID: 1,
PID: 1,
PPID: 1,
@@ -83,7 +83,7 @@ func TestProcessListJSON(t *testing.T) {
},
{
pl: []*Process{
- &Process{
+ {
UID: 0,
PID: 0,
PPID: 0,
@@ -92,7 +92,7 @@ func TestProcessListJSON(t *testing.T) {
Time: "0",
Cmd: "zero",
},
- &Process{
+ {
UID: 1,
PID: 1,
PPID: 1,
diff --git a/pkg/sentry/kernel/semaphore/semaphore_test.go b/pkg/sentry/kernel/semaphore/semaphore_test.go
index 0386586ab..1c6a2e1e9 100644
--- a/pkg/sentry/kernel/semaphore/semaphore_test.go
+++ b/pkg/sentry/kernel/semaphore/semaphore_test.go
@@ -57,7 +57,7 @@ func TestBasic(t *testing.T) {
ctx := contexttest.Context(t)
set := &Set{ID: 123, sems: make([]sem, 1)}
ops := []linux.Sembuf{
- linux.Sembuf{SemOp: 1},
+ {SemOp: 1},
}
executeOps(ctx, t, set, ops, false)
@@ -78,7 +78,7 @@ func TestWaitForZero(t *testing.T) {
ctx := contexttest.Context(t)
set := &Set{ID: 123, sems: make([]sem, 1)}
ops := []linux.Sembuf{
- linux.Sembuf{SemOp: 0},
+ {SemOp: 0},
}
executeOps(ctx, t, set, ops, false)
@@ -117,7 +117,7 @@ func TestNoWait(t *testing.T) {
ctx := contexttest.Context(t)
set := &Set{ID: 123, sems: make([]sem, 1)}
ops := []linux.Sembuf{
- linux.Sembuf{SemOp: 1},
+ {SemOp: 1},
}
executeOps(ctx, t, set, ops, false)
@@ -146,7 +146,7 @@ func TestUnregister(t *testing.T) {
}
ops := []linux.Sembuf{
- linux.Sembuf{SemOp: -1},
+ {SemOp: -1},
}
chs := make([]chan struct{}, 0, 5)
for i := 0; i < 5; i++ {
diff --git a/runsc/fsgofer/fsgofer.go b/runsc/fsgofer/fsgofer.go
index 5ddc75a9d..be2ac5f3c 100644
--- a/runsc/fsgofer/fsgofer.go
+++ b/runsc/fsgofer/fsgofer.go
@@ -614,8 +614,8 @@ func (l *localFile) SetAttr(valid p9.SetAttrMask, attr p9.SetAttr) error {
if valid.ATime || valid.MTime {
utimes := [2]syscall.Timespec{
- syscall.Timespec{Sec: 0, Nsec: linux.UTIME_OMIT},
- syscall.Timespec{Sec: 0, Nsec: linux.UTIME_OMIT},
+ {Sec: 0, Nsec: linux.UTIME_OMIT},
+ {Sec: 0, Nsec: linux.UTIME_OMIT},
}
if valid.ATime {
if valid.ATimeNotSystemTime {
diff --git a/runsc/fsgofer/fsgofer_test.go b/runsc/fsgofer/fsgofer_test.go
index 7d834d596..58d04aefa 100644
--- a/runsc/fsgofer/fsgofer_test.go
+++ b/runsc/fsgofer/fsgofer_test.go
@@ -39,12 +39,12 @@ var (
allConfs []Config
rwConfs = []Config{
- Config{ROMount: false, LazyOpenForWrite: false},
- Config{ROMount: false, LazyOpenForWrite: true},
+ {ROMount: false, LazyOpenForWrite: false},
+ {ROMount: false, LazyOpenForWrite: true},
}
roConfs = []Config{
- Config{ROMount: true, LazyOpenForWrite: false},
- Config{ROMount: true, LazyOpenForWrite: true},
+ {ROMount: true, LazyOpenForWrite: false},
+ {ROMount: true, LazyOpenForWrite: true},
}
)
diff --git a/runsc/sandbox/sandbox.go b/runsc/sandbox/sandbox.go
index 13bf5d800..0354a64b9 100644
--- a/runsc/sandbox/sandbox.go
+++ b/runsc/sandbox/sandbox.go
@@ -493,8 +493,8 @@ func (s *Sandbox) createSandboxProcess(conf *boot.Config, binPath string, common
// namespace for these.
log.Infof("Sandbox will be started in empty IPC and UTS namespaces")
nss := []specs.LinuxNamespace{
- specs.LinuxNamespace{Type: specs.IPCNamespace},
- specs.LinuxNamespace{Type: specs.UTSNamespace},
+ {Type: specs.IPCNamespace},
+ {Type: specs.UTSNamespace},
}
if conf.Platform == boot.PlatformPtrace {