← Back to branch summary

~ubuntu-branches/ubuntu/vivid/lxcfs/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/0001-Fix-test_proc-following-the-stat-fix.patch

  • Committer: Package Import Robot
  • Author(s): Stéphane Graber
  • Date: 2015-02-16 23:44:24 UTC
  • Revision ID: package-import@ubuntu.com-20150216234424-bv73v453niw6c02o
Tags: 0.6-0ubuntu2
Cherry-pick testcase fix from upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0001-Fix-test_proc-following-the-stat-fix.patch
 
1
From 1272e278a5b83de5e21c53ed0ea8aeb2e46daebb Mon Sep 17 00:00:00 2001
 
2
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@ubuntu.com>
 
3
Date: Mon, 16 Feb 2015 23:42:33 -0500
 
4
Subject: Fix test_proc following the stat fix
 
5
MIME-Version: 1.0
 
6
Content-Type: text/plain; charset=UTF-8
 
7
Content-Transfer-Encoding: 8bit
 
8
 
 
9
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
 
10
---
 
11
 tests/test_proc | 2 +-
 
12
 1 file changed, 1 insertion(+), 1 deletion(-)
 
13
 
 
14
diff --git a/tests/test_proc b/tests/test_proc
 
15
index 0c42892..4ed47d7 100755
 
16
--- a/tests/test_proc
 
17
+++ b/tests/test_proc
 
18
@@ -28,7 +28,7 @@ cgm setvalue cpuset $(cgm getpidcgroupabs cpuset $$) \
 
19
 grep -q "^processor.*0$" /var/lib/lxcfs/proc/cpuinfo
 
20
 
 
21
 # Test stat
 
22
-[ "$(grep "^cpu" /var/lib/lxcfs/proc/stat | wc -l)" = "1" ]
 
23
+[ "$(grep "^cpu" /var/lib/lxcfs/proc/stat | wc -l)" = "2" ]
 
24
 
 
25
 # Test meminfo
 
26
 grep -q "^MemTotal.*1024 kB$" /var/lib/lxcfs/proc/meminfo