Merge branch 'master' into feature/add_context_support

afontaine · Jan 9, 2018 · a97abd3 · a97abd3
2 parents cd61c36 + d1fb05a
commit a97abd3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/docker/docker_notlinux.go b/docker/docker_notlinux.go
@@ -4,8 +4,6 @@ package docker
 
 import (
 	"context"
-	"encoding/json"
-
 	"github.com/shirou/gopsutil/cpu"
 	"github.com/shirou/gopsutil/internal/common"
 )
@@ -65,8 +63,3 @@ func CgroupMemDocker(containerid string) (*CgroupMemStat, error) {
 func CgroupMemDockerWithContext(ctx context.Context, containerid string) (*CgroupMemStat, error) {
 	return CgroupMem(containerid, common.HostSys("fs/cgroup/memory/docker"))
 }
-
-func (m CgroupMemStat) String() string {
-	s, _ := json.Marshal(m)
-	return string(s)
-}
diff --git a/host/host_test.go b/host/host_test.go
@@ -2,6 +2,7 @@ package host
 
 import (
 	"fmt"
+	"os"
 	"testing"
 )
 
@@ -20,6 +21,10 @@ func TestHostInfo(t *testing.T) {
 }
 
 func TestUptime(t *testing.T) {
+	if os.Getenv("CIRCLECI") == "true" {
+		t.Skip("Skip CI")
+	}
+
 	v, err := Uptime()
 	if err != nil {
 		t.Errorf("error %v", err)
@@ -30,6 +35,9 @@ func TestUptime(t *testing.T) {
 }
 
 func TestBoot_time(t *testing.T) {
+	if os.Getenv("CIRCLECI") == "true" {
+		t.Skip("Skip CI")
+	}
 	v, err := BootTime()
 	if err != nil {
 		t.Errorf("error %v", err)

diff --git a/process/process_test.go b/process/process_test.go
@@ -301,6 +301,10 @@ func Test_Process_CpuPercentLoop(t *testing.T) {
 }
 
 func Test_Process_CreateTime(t *testing.T) {
+	if os.Getenv("CIRCLECI") == "true" {
+		t.Skip("Skip CI")
+	}
+
 	p := testGetProcess()
 
 	c, err := p.CreateTime()