From f148242abab1ff043428036ccaf464de98268863 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Mon, 14 Sep 2020 15:32:46 -0700
Subject: Revert "fuse: add benchmarking support for FUSE"

test/fuse/benchmark/read_benchmark.cc:34: Failure
Expected: (fuse_prefix) != (nullptr), actual: NULL vs (nullptr)
external/com_google_benchmark/src/benchmark_runner.cc:120: RunInThread:
Check `st.iterations() >= st.max_iterations' failed. Benchmark returned
before State::KeepRunning() returned false!
--- FAIL: Benchmarks_BM_Read/262144/real_time (0.29s)
    runner.go:502: test "Benchmarks.BM_Read/262144/real_time" failed
    with error exit status 134, want nil
FAIL
---
 pkg/test/dockerutil/container.go  | 10 ----------
 pkg/test/dockerutil/dockerutil.go | 20 --------------------
 2 files changed, 30 deletions(-)

(limited to 'pkg/test')

diff --git a/pkg/test/dockerutil/container.go b/pkg/test/dockerutil/container.go
index 727be26b2..64d17f661 100644
--- a/pkg/test/dockerutil/container.go
+++ b/pkg/test/dockerutil/container.go
@@ -136,11 +136,6 @@ func MakeNativeContainer(ctx context.Context, logger testutil.Logger) *Container
 	}
 }
 
-// Runtime returns the runtime of the container.
-func (c *Container) Runtime() string {
-	return c.runtime
-}
-
 // AddProfile adds a profile to this container.
 func (c *Container) AddProfile(p Profile) {
 	c.profiles = append(c.profiles, p)
@@ -546,8 +541,3 @@ func (c *Container) CleanUp(ctx context.Context) {
 	// Forget all mounts.
 	c.mounts = nil
 }
-
-// CopyErr returns the error that happened during copy.
-func (c *Container) CopyErr() error {
-	return c.copyErr
-}
diff --git a/pkg/test/dockerutil/dockerutil.go b/pkg/test/dockerutil/dockerutil.go
index a2d7e8c85..7027df1a5 100644
--- a/pkg/test/dockerutil/dockerutil.go
+++ b/pkg/test/dockerutil/dockerutil.go
@@ -121,26 +121,6 @@ func UsingVFS2() (bool, error) {
 	return false, nil
 }
 
-// UsingFUSE returns true if the 'runtime' has the fuse flag set.
-func UsingFUSE() (bool, error) {
-	rMap, err := runtimeMap()
-	if err != nil {
-		return false, err
-	}
-
-	list, ok := rMap["runtimeArgs"].([]interface{})
-	if !ok {
-		return false, fmt.Errorf("unexpected format: %v", rMap)
-	}
-
-	for _, element := range list {
-		if element == "--fuse" {
-			return true, nil
-		}
-	}
-	return false, nil
-}
-
 func runtimeMap() (map[string]interface{}, error) {
 	// Read the configuration data; the file must exist.
 	configBytes, err := ioutil.ReadFile(*config)
-- 
cgit v1.2.3