Create and delete groups, handle delete errors

1 files changed, 32 insertions, 8 deletions

diff --git a/000.yarn b/000.yarn
index 290375c..0744635 100644
--- a/000.yarn
+++ b/000.yarn
@@ -208,14 +208,14 @@ groups, and respositories.
     AND we create user tina
     AND we create user ci
 
-<!--
-
     WHEN we create group qvarndevs
     AND we create group qvarnguests
     AND we create group ops
     AND we create group otherdevs
     AND we create group staff
 
+<!--
+
     WHEN we add ian to qvarndevs
     AND we add tina to qvarndevs
     AND we add gabriells to qvarnguests
@@ -280,6 +280,12 @@ Use case: Steven updates internal wiki.
     AND remove user tina
     AND remove user ci
 
+    AND remove group qvarndevs
+    AND remove group qvarnguests
+    AND remove group ops
+    AND remove group otherdevs
+    AND remove group staff
+
 # Scenario step implementations
 
     IMPLEMENTS WHEN we run gitano (.+)
@@ -295,11 +301,29 @@ Use case: Steven updates internal wiki.
     username = helper.get_next_match()
     helper.gitano('user add {} user@example.com Test User'.format(username))
 
+    IMPLEMENTS WHEN we create group (\S+)
+    group = helper.get_next_match()
+    helper.gitano('group add {} Test group'.format(group))
+
     IMPLEMENTS FINALLY remove user (\S+)
     username = helper.get_next_match()
-    output = helper.gitano('user del {}'.format(username))
-    print output
-    last_line = output.splitlines()[-1]
-    token = last_line.split()[-1]
-    output = helper.gitano('user del {} {}'.format(username, token))
-    print output
+    try:
+        output = helper.gitano('user del {}'.format(username))
+    except cliapp.AppException:
+        pass
+    else:
+        last_line = output.splitlines()[-1]
+        token = last_line.split()[-1]
+        helper.gitano('user del {} {}'.format(username, token))
+
+    IMPLEMENTS FINALLY remove group (\S+)
+    group = helper.get_next_match()
+    try:
+        output = helper.gitano('group del {}'.format(group))
+    except cliapp.AppException:
+        pass
+    else:
+        last_line = output.splitlines()[-1]
+        token = last_line.split()[-1]
+        helper.gitano('group del {} {}'.format(group, token))
+