fix: addressed review points

Author: jsam

MANIFEST.in

@@ -41,7 +41,6 @@ include babel.ini
 include brew.py
 include pytest.ini
 include snap/snapcraft.yaml
-recursive-include renku *.json
 recursive-include .github CODEOWNERS
 recursive-include .travis *.sh
 recursive-include docs *.bat

conftest.py

@@ -514,38 +514,38 @@ def remote_project(data_repository, directory_tree):
         yield runner, project_path
 
 
-@pytest.fixture(scope='function')
-def dummy_datapack():
-    """Creates dummy data folder."""
-    temp_dir = tempfile.TemporaryDirectory()
-
-    data_file_txt = Path(temp_dir.name) / Path('file.txt')
-    data_file_txt.write_text('my awesome data')
-
-    data_file_csv = Path(temp_dir.name) / Path('file.csv')
-    data_file_csv.write_text('more,awesome,data')
-
-    yield temp_dir
+# @pytest.fixture(scope='function')
+# def dummy_datapack():
+#     """Creates dummy data folder."""
+#     temp_dir = tempfile.TemporaryDirectory()
+#
+#     data_file_txt = Path(temp_dir.name) / Path('file.txt')
+#     data_file_txt.write_text('my awesome data')
+#
+#     data_file_csv = Path(temp_dir.name) / Path('file.csv')
+#     data_file_csv.write_text('more,awesome,data')
+#
+#     yield temp_dir
 
 
 @pytest.fixture(scope='function')
-def datapack_zip(dummy_datapack):
+def datapack_zip(directory_tree):
     """Returns dummy data folder as a zip archive."""
     from renku.core.utils.contexts import chdir
     workspace_dir = tempfile.TemporaryDirectory()
     with chdir(workspace_dir.name):
-        shutil.make_archive('datapack', 'zip', dummy_datapack.name)
+        shutil.make_archive('datapack', 'zip', directory_tree)
 
     yield Path(workspace_dir.name) / 'datapack.zip'
 
 
 @pytest.fixture(scope='function')
-def datapack_tar(dummy_datapack):
+def datapack_tar(directory_tree):
     """Returns dummy data folder as a tar archive."""
     from renku.core.utils.contexts import chdir
     workspace_dir = tempfile.TemporaryDirectory()
     with chdir(workspace_dir.name):
-        shutil.make_archive('datapack', 'tar', dummy_datapack.name)
+        shutil.make_archive('datapack', 'tar', directory_tree)
 
     yield Path(workspace_dir.name) / 'datapack.tar'
 

docker-compose.yml

@@ -3,8 +3,6 @@ version: '3'
 services:
   redis:
     image: redis:5.0.3-alpine
-    ports:
-      - "6379:6379"
 
   renku-svc:
     image: renku-svc:latest

tests/service/test_cache_views.py

@@ -462,7 +462,7 @@ def test_upload_zip_unpack_archive(datapack_zip, svc_client_with_repo):
 
     assert 200 == response.status_code
     assert {'result'} == set(response.json.keys())
-    assert 2 == len(response.json['result']['files'])
+    assert 3 == len(response.json['result']['files'])
 
     for file_ in response.json['result']['files']:
         assert not file_['is_archive']
@@ -520,7 +520,7 @@ def test_upload_tar_unpack_archive(datapack_tar, svc_client_with_repo):
 
     assert 200 == response.status_code
     assert {'result'} == set(response.json.keys())
-    assert 2 == len(response.json['result']['files'])
+    assert 3 == len(response.json['result']['files'])
 
     for file_ in response.json['result']['files']:
         assert not file_['is_archive']
@@ -579,7 +579,7 @@ def test_field_upload_resp_fields(datapack_tar, svc_client_with_repo):
     assert 200 == response.status_code
 
     assert {'result'} == set(response.json.keys())
-    assert 2 == len(response.json['result']['files'])
+    assert 3 == len(response.json['result']['files'])
     assert {
         'content_type',
         'file_id',

tests/service/test_dataset_views.py

@@ -381,7 +381,7 @@ def test_add_with_unpacked_archive(datapack_zip, svc_client_with_repo):
 
     assert 200 == response.status_code
     assert {'result'} == set(response.json.keys())
-    assert 2 == len(response.json['result']['files'])
+    assert 3 == len(response.json['result']['files'])
 
     for file_ in response.json['result']['files']:
         assert not file_['is_archive']
@@ -475,7 +475,7 @@ def test_add_with_unpacked_archive_all(datapack_zip, svc_client_with_repo):
 
     assert 200 == response.status_code
     assert {'result'} == set(response.json.keys())
-    assert 2 == len(response.json['result']['files'])
+    assert 3 == len(response.json['result']['files'])
 
     for file_ in response.json['result']['files']:
         assert not file_['is_archive']