From 0b19087c88400fc2acab8df57608dbfd225ed997 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 13 May 2021 21:16:43 +0100
Subject: [PATCH] Fix unit tests

---
 city.py   | 2 +-
 person.py | 6 +++++-
 roles.py  | 7 -------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/city.py b/city.py
index 3ea9983b7..004b2b328 100644
--- a/city.py
+++ b/city.py
@@ -128,7 +128,7 @@ def _getCityPulse(currTimeOfDay, decoySeed: int) -> (float, float):
 
 def spoofGeolocation(baseDir: str,
                      city: str, currTime, decoySeed: int,
-                     citiesList: []) -> (float, float, str, str, \
+                     citiesList: []) -> (float, float, str, str,
                                          str, str, int):
     """Given a city and the current time spoofs the location
     for an image
diff --git a/person.py b/person.py
index 2dc42214c..6c28c13a5 100644
--- a/person.py
+++ b/person.py
@@ -593,10 +593,14 @@ def personUpgradeActor(baseDir: str, personJson: {},
         updateActor = True
 
     if not personJson.get('affiliation'):
+        rolesStr = ''
+        adminName = getConfigParam(baseDir, 'admin')
+        if personJson['id'].endswith('/users/' + adminName):
+            rolesStr = 'admin'
         statusNumber, published = getStatusNumber()
         personJson['affiliation'] = {
             "@type": "OrganizationRole",
-            "roleName": "",
+            "roleName": rolesStr,
             "affiliation": {
                 "@type": "WebSite",
                 "url": personJson['id'].split('/users/')[0]
diff --git a/roles.py b/roles.py
index 0ce857d49..1eba0fa10 100644
--- a/roles.py
+++ b/roles.py
@@ -7,13 +7,6 @@ __email__ = "bob@freedombone.net"
 __status__ = "Production"
 
 import os
-from webfinger import webfingerHandle
-from auth import createBasicAuthHeader
-from posts import getPersonBox
-from session import postJson
-from utils import getFullDomain
-from utils import getNicknameFromActor
-from utils import getDomainFromActor
 from utils import loadJson
 from utils import saveJson