From: Josh Durgin <jdurgin@redhat.com>
Date: Sat, 21 Nov 2015 00:49:39 +0000 (-0800)
Subject: teuthology-tree: remove whitespace from metadata
X-Git-Tag: 1.1.0~727^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=97c585170e9ba0d8dc2f3fc24865c7d7b969e509;p=teuthology.git

teuthology-tree: remove whitespace from metadata

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
---

diff --git a/teuthology/test/test_tree.py b/teuthology/test/test_tree.py
index 1f6a2d96e..797fed6c7 100644
--- a/teuthology/test/test_tree.py
+++ b/teuthology/test/test_tree.py
@@ -62,12 +62,12 @@ expected_tree = """├── %
 expected_desc = [
     '',
     '',
-    ' install ceph',
+    'install ceph',
     '',
-    ' single node cluster',
+    'single node cluster',
     '',
-    ' c/c++ librbd api tests with default settings',
-    ' c/c++ librbd api tests with format 1 images',
+    'c/c++ librbd api tests with default settings',
+    'c/c++ librbd api tests with format 1 images',
 ]
 
 
@@ -78,8 +78,8 @@ expected_rbd_features = [
     '',
     '',
     '',
-    ' default',
-    ' none',
+    'default',
+    'none',
 ]
 
 
diff --git a/teuthology/tree.py b/teuthology/tree.py
index 51745185e..ff593b041 100644
--- a/teuthology/tree.py
+++ b/teuthology/tree.py
@@ -26,7 +26,7 @@ def extract_info(file_name, filters, _isdir=os.path.isdir, _open=open):
                 if line.startswith(prefix):
                     if result[filt]:
                         result[filt] += '\n'
-                    result[filt] += line[len(prefix):].rstrip('\n')
+                    result[filt] += line[len(prefix):].rstrip('\n').strip()
     return result
 
 def tree_with_info(cur_dir, filters, prefix, rows,