extend query tests

Signed-off-by: hwassman <[email protected]>

Author: Helene

tests/test_query.py

@@ -4,9 +4,10 @@
 
 
 def my_setup():
-    global metrics, metrics1
+    global metrics, metrics1, capSensors
     metrics = ['cpu_user']
     metrics1 = ['gpfs_fs_inode_used']
+    capSensors = ['GPFSDiskCap','GPFSPoolCap', 'GPFSInodeCap']
 
 @with_setup(my_setup)
 def test_case01():
@@ -19,3 +20,20 @@ def test_case01():
 def test_case02():
     query = Query(metrics1)
     assert "-ar" in str(query)
+    query.addMetric('cpu_user')
+    assert "-ar" in str(query)
+
+@with_setup(my_setup)
+def test_case03():
+    for sensor in capSensors:
+        query = Query()
+        query.sensor = sensor
+        assert "-ar" in str(query)
+    query = Query()
+    query.sensor = 'CPU'
+    assert "-ar" not in str(query)
+    assert "group" in str(query)
+    query = Query(includeDiskData=True)
+    query.sensor = 'GPFSDiskCap'
+    assert "-ar" in str(query)
+