get unit tests working, bug fix loading people data

usnistgov · Sep 18, 2024 · 9d08dbd · 9d08dbd
1 parent d9f4780
commit 9d08dbd
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/python-source.yml b/.github/workflows/python-source.yml
@@ -30,7 +30,7 @@ jobs:
  run: scripts/testall.docker python
 
  - name: Upload Artifacts
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v4
  if: failure()
  with:
  name: test-artifacts

diff --git a/docker/midasserver/midas-dmpdapnsd_conf.yml b/docker/midasserver/midas-dmpdapnsd_conf.yml
@@ -93,7 +93,7 @@ services:
  data:
  dir: /data/nsd
  person_file: person.json
- org_file: nistorg.json
+ org_file: orgs.json
  conventions: 
  nsd1:
  about: 

diff --git a/python/nistoar/midas/wsgi.py b/python/nistoar/midas/wsgi.py
@@ -580,7 +580,7 @@ def handle_path_request(self, path: str, env: Mapping, start_resp: Callable, who
  def load_people_from(self, datadir=None):
  if any(k.startswith("nsd/") for k in self.subapps.keys()):
  nsdapp = [v for k,v in self.subapps.items() if k.startswith("nsd/")][0]
- nsdapp.load_from()
+ nsdapp.load_from(datadir)
 
 
 app = MIDASApp

diff --git a/python/nistoar/nsd/service.py b/python/nistoar/nsd/service.py
@@ -283,9 +283,9 @@ def load(self, config, log=None, clear=True, withtrans=False):
  personfile = config.get('person_file', "person.json")
  orgfile = config.get('org_file', "orgs.json")
  if not os.path.isfile(os.path.join(datadir, personfile)):
- raise ConfigurationException(f"{personfile}: NSD data does not exist as a file")
+ raise ConfigurationException(f"{personfile}: NSD data does not exist as a file in {datadir}")
  if not os.path.isfile(os.path.join(datadir, orgfile)):
- raise ConfigurationException(f"{orgfile}: NSD data does not exist as a file")
+ raise ConfigurationException(f"{orgfile}: NSD data does not exist as a file in {datadir}")
 
  if not withtrans:
  self._load_notrans(datadir, personfile, orgfile, log, clear)

diff --git a/python/nistoar/nsd/wsgi/nsd1.py b/python/nistoar/nsd/wsgi/nsd1.py
@@ -153,7 +153,7 @@ def load_from(self, datadir=None):
  datacfg.setdefault("dir", "/data/nsd")
  if datadir:
  datacfg = dict(self.cfg.items())
- datacfg['datadir'] = datadir
+ datacfg['dir'] = str(datadir)
  self.svc.load(datacfg, self.log, True)
 
 PeopleServiceApp = NSDServiceApp

diff --git a/python/nistoar/web/rest/base.py b/python/nistoar/web/rest/base.py
@@ -511,7 +511,7 @@ def __init__(self, config: Mapping, log: Logger, base_ep: str = None, name: str
  self.name = self.cfg.get("name", "")
  self.base_ep = None
  if not base_ep:
- base_ep = self.cfg.get("base_ep")
+ base_ep = self.cfg.get("base_ep", "")
  base_ep = base_ep.strip('/')
  if base_ep:
  self.base_ep = '/%s/' % base_ep

diff --git a/python/tests/nistoar/midas/test_wsgi.py b/python/tests/nistoar/midas/test_wsgi.py
@@ -1184,6 +1184,7 @@ def setUp(self):
  os.path.join(self.workdir, 'nerdm')
  self.config['services']['nsd']['db_url'] = os.environ.get("MONGO_TESTDB_URL",
  "mongodb://admin:admin@localhost/testdb")
+ self.config['services']['nsd']['data']['dir'] = str(peopledatadir)
  cliagents = {'ark:/88434/tl0-0001': ["Unit testing agent"]}
  self.config['authentication'] = { "key": "XXXXX", "algorithm": "HS256", "require_expiration": False,
  'client_agents': cliagents }