summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2017-04-24 17:06:01 +0300
committerLars Wirzenius <liw@liw.fi>2017-04-24 17:06:01 +0300
commit5cac764d68b9a3ecf3bc3cee862d6f91f14381b7 (patch)
tree4bd2d56200bc3d5367500fc50ac030507af968da
parent9556b7df69762e60efdc1ab4d57feefc39c8306d (diff)
downloadgit.liw.fi-ruleset-tests-5cac764d68b9a3ecf3bc3cee862d6f91f14381b7.tar.gz
Use vars insted of get_variable
-rw-r--r--000.yarn17
1 files changed, 11 insertions, 6 deletions
diff --git a/000.yarn b/000.yarn
index 555b4fd..0cf78a9 100644
--- a/000.yarn
+++ b/000.yarn
@@ -268,8 +268,10 @@ WHEN admin creates user
IMPLEMENTS WHEN admin creates user (\S+)
username = get_next_match()
+ if vars['users'] is None:
+ vars['users'] = []
+ vars['users'].append(username)
# FIXME: Create first, this is temporary
- helper.append_to_list('users', username)
helper.gitano(
None,
'user add {} {}@example.com Test {}'.format(
@@ -283,8 +285,9 @@ WHEN admin creates group
IMPLEMENTS WHEN admin creates group (\S+)
group = get_next_match()
- # FIXME: Create first, this is temporary
- helper.append_to_list('groups', group)
+ if vars['groups'] is None:
+ vars['groups'] = []
+ vars['groups'].append(group)
helper.gitano(None, 'group add {} Test group'.format(group))
WHEN admin adds user to group
@@ -301,8 +304,10 @@ WHEN admin created repository
IMPLEMENTS WHEN admin creates repository (\S+)
repo = get_next_match()
- # FIXME: Create first, this is temporary
- helper.append_to_list('repositories', repo)
+ if vars['repositories'] is None:
+ vars['repositories'] = []
+ vars['repositories'].append(repo)
+
helper.gitano(None, 'create {}'.format(repo))
# Make a commit in master in the repo, push that.
@@ -457,7 +462,7 @@ FINALLY clean up anything created during tests
IMPLEMENTS FINALLY admin removes things that were created
def iter(var, prefix):
- items = helper.get_variable(var, [])
+ items = vars[var] or []
for item in items:
helper.gitano_confirm_with_token(prefix, item)
iter('users', 'user del')