GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Tests: Removed taskd group features from test framework

Browse source
This commit is contained in:
Paul Beckingham 2017-03-20 22:23:08 -04:00
parent 97612b892a
commit 60220546c1
2 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
test/basetest/task.py
View file

@ -114,18 +114,17 @@ class Task(object):
""" """
if taskd_user is None: if taskd_user is None:
if default: if default:
user, group, org, userkey = self.taskd.default_user user, org, userkey = self.taskd.default_user
else: else:
user, group, org, userkey = self.taskd.create_user() user, org, userkey = self.taskd.create_user()
else: else:
user, group, org, userkey = taskd_user user, org, userkey = taskd_user
credentials = "/".join((org, user, userkey)) credentials = "/".join((org, user, userkey))
self.config("taskd.credentials", credentials) self.config("taskd.credentials", credentials)
self.credentials = { self.credentials = {
"user": user, "user": user,
"group": group,
"org": org, "org": org,
"userkey": userkey, "userkey": userkey,
} }

13
test/basetest/taskd.py
View file

@ -110,9 +110,8 @@ class Taskd(object):
# Make sure TASKDDATA points to the temporary folder # Make sure TASKDDATA points to the temporary folder
self.env["TASKDDATA"] = self.datadir self.env["TASKDDATA"] = self.datadir
def create_user(self, user=None, group=None, org=None): def create_user(self, user=None, org=None):
"""Create a user/group in the server and return the user """Create a user in the server and return the user credentials to use in a taskw client.
credentials to use in a taskw client.
""" """
if user is None: if user is None:
# Create a unique user ID # Create a unique user ID
@ -122,20 +121,16 @@ class Taskd(object):
# Increment the user_id # Increment the user_id
self.usercount += 1 self.usercount += 1
if group is None:
group = "default_group"
if org is None: if org is None:
org = "default_org" org = "default_org"
self._add_entity("org", org, ignore_exists=True) self._add_entity("org", org, ignore_exists=True)
self._add_entity("group", org, group, ignore_exists=True)
userkey = self._add_entity("user", org, user) userkey = self._add_entity("user", org, user)
return user, group, org, userkey return user, org, userkey
def _add_entity(self, keyword, org, value=None, ignore_exists=False): def _add_entity(self, keyword, org, value=None, ignore_exists=False):
"""Add an organization, group or user to the current server """Add an organization or user to the current server
If a user creation is requested, the user unique ID is returned If a user creation is requested, the user unique ID is returned
""" """