Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/func

2 files changed, 42 insertions, 20 deletions

diff --git a/test/unittest/test_client.py b/test/unittest/test_client.py
index f4d56cc..ed13c6a 100644
--- a/test/unittest/test_client.py
+++ b/test/unittest/test_client.py
@@ -288,23 +288,23 @@ class TestSystem(BaseTest):
         pass
 
 
-
-class TestAsyncTest(BaseTest):
-    module = "async.test"
-    nforks=4
-    async=True
-    def test_sleep_async(self):
-        job_id = self.client.test.sleep(5)
-        print "job_id", job_id
-        (return_code, results) = self.client.job_status(job_id)
-#        self.assert_on_fault(results)
-        print "return_code", return_code
-        print "results", results
-
-    def test_add_async(self):
-        job_id = self.client.test.add(1,5)
-        print "job_id", job_id
-        (return_code, results) = self.client.job_status(job_id)
-#        self.assert_on_fault(results)
-        print "return_code", return_code
-        print "results", results
+#import time
+#class TestAsyncTest(BaseTest):
+#    module = "async.test"
+#    nforks=1
+#    async=True
+#    def test_sleep_async(self):
+#        job_id = self.client.test.sleep(5)
+#        print "job_id", job_id
+#        time.sleep(5)
+#        (return_code, results) = self.client.job_status(job_id)
+#        print "return_code", return_code
+#        print "results", results
+#
+#    def test_add_async(self):
+#        job_id = self.client.test.add(1,5)
+#        print "job_id", job_id
+#        time.sleep(6)
+#        (return_code, results) = self.client.job_status(job_id)
+#        print "return_code", return_code
+       # print "results", results
diff --git a/test/unittest/test_groups.py b/test/unittest/test_groups.py
new file mode 100644
index 0000000..639022a
--- /dev/null
+++ b/test/unittest/test_groups.py
@@ -0,0 +1,22 @@
+#!/usr/bin/python
+
+# unit tests for group functionality in func
+
+import func.overlord.client as fc
+
+
+
+class TestGroups(object):
+
+    def test_expand_servers(self):
+        result = fc.expand_servers("*")
+        print result
+
+    def test_get_groups(self):
+        result = fc.get_groups()
+        print result
+
+    def test_get_hosts_by_groupgoo(self):
+        group_dict = fc.get_groups()
+        hosts = fc.get_hosts_by_groupgoo(group_dict, "@blippy")
+        print hosts