Skip to content
Snippets Groups Projects
Commit 69a11a55 authored by Enrique Garcia's avatar Enrique Garcia
Browse files

fix tests

parent 982fd666
No related branches found
No related tags found
1 merge request!57eossr upload unique function
Pipeline #140849 failed
......@@ -32,7 +32,7 @@ zenodo_sandbox_api_url = "https://sandbox.zenodo.org/api"
class ZenodoAPI:
def __init__(self, access_token, sandbox=True, proj_root_dir='./'):
def __init__(self, access_token, sandbox=True, proj_root_dir=Path('./').absolute().name):
"""
Manages the communication with the (sandbox.)zenodo REST API through the Python request library.
The client would allow to perform the following tasks within the (sandbox.)zenodo api environment:
......
......@@ -2,11 +2,11 @@
# This script is meant to be used by the continuous integration of a git repository to upload its content to the OSSR
import tempfile
import shutil
import argparse
import json
from pathlib import Path
from copy import deepcopy
from distutils.util import strtobool
from eossr.api.zenodo import ZenodoAPI, Record
from eossr.metadata.codemeta2zenodo import converter
......@@ -70,7 +70,10 @@ def upload(zenodo_token, sandbox_flag, upload_directory, zip_root_dir=False, rec
metadata = converter(codemeta)
else:
raise FileNotFoundError("No metadata provided")
record = Record(metadata)
metadata_for_check = deepcopy(metadata)
metadata_for_check['id'] = 1 # fake id to create fake record
record = Record(metadata_for_check)
# Searches for similar records
similar_records = find_similar_records(zenodo, record)
......
......@@ -36,7 +36,12 @@ def run_script(*args):
def test_codemeta2zenodo():
existing_zenodo_file = Path(ROOT_DIR).joinpath('.zenodo.json')
if existing_zenodo_file.exists():
existing_zenodo_file.unlink()
run_script("eossr-codemeta2zenodo", "-i", join(ROOT_DIR, "codemeta.json"))
existing_zenodo_file.unlink()
def test_parse_last_release_git_bash():
......
......@@ -74,7 +74,8 @@ def zip_repository(directory, zip_filename=None):
"""
# prepare zip archive
directory = Path(directory)
zip_filename = f'{directory.name}.zip' if zip_filename is None else f'{zip_filename.replace(".zip", "")}.zip'
zip_filename = f'{directory.absolute().name}.zip' if zip_filename is None \
else f'{zip_filename.replace(".zip", "")}.zip'
print(f" * Zipping the content of {directory.name} into {zip_filename}")
exclude = [zip_filename, '.git']
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment