fix: added test utility functions and cleanup (#1014)

tests/core/commands/test_dataset.py

@@ -16,46 +16,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Dataset tests."""
-
 import os
 import shutil
 import stat
-from contextlib import contextmanager
 
 import pytest
 from git import Repo
+from tests.utils import raises
 
 from renku.core import errors
 from renku.core.commands.dataset import create_dataset
 from renku.core.models.datasets import Dataset, DatasetFile
 from renku.core.models.provenance.agents import Person
 
 
-def _key(client, dataset, filename):
-    """Return key in dataset for a given filename."""
-    dataset_path = client.renku_datasets_path / dataset.name
-    return os.path.relpath(
-        str(client.path / client.datadir / dataset.name / filename),
-        start=str(dataset_path),
-    )
-
-
-def raises(error):
-    """Wrapper around pytest.raises to support None."""
-    if error:
-        return pytest.raises(error)
-    else:
-
-        @contextmanager
-        def not_raises():
-            try:
-                yield
-            except Exception as e:
-                raise e
-
-        return not_raises()
-
-
 @pytest.mark.parametrize(
     'scheme, path, force, error',
     [('', 'temp', False, None), ('file://', 'temp', True, None),

tests/core/commands/test_init.py

@@ -18,12 +18,12 @@
 """Project initialization tests."""
 
 import shutil
-from contextlib import contextmanager
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
 import pkg_resources
 import pytest
+from tests.utils import raises
 
 from renku.core import errors
 from renku.core.commands.init import TEMPLATE_MANIFEST, create_from_template, \
@@ -41,22 +41,6 @@
 template_local = Path(pkg_resources.resource_filename('renku', 'templates'))
 
 
-def raises(error):
-    """Wrapper around pytest.raises to support None."""
-    if error:
-        return pytest.raises(error)
-    else:
-
-        @contextmanager
-        def not_raises():
-            try:
-                yield
-            except Exception as e:
-                raise e
-
-        return not_raises()
-
-
 @pytest.mark.parametrize(
     'url, ref, result, error', [(TEMPLATE_URL, TEMPLATE_REF, True, None),
                                 (FAKE, TEMPLATE_REF, None, errors.GitError),

tests/utils.py

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2020 - Swiss Data Science Center (SDSC)
+# A partnership between École Polytechnique Fédérale de Lausanne (EPFL) and
+# Eidgenössische Technische Hochschule Zürich (ETHZ).
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Test utility functions."""
+from contextlib import contextmanager
+
+import pytest
+
+
+def raises(error):
+    """Wrapper around pytest.raises to support None."""
+    if error:
+        return pytest.raises(error)
+    else:
+
+        @contextmanager
+        def not_raises():
+            try:
+                yield
+            except Exception as e:
+                raise e
+
+        return not_raises()