Merge branch 'gmerge' into gmaster

# Conflicts:
#	cellxgene_gateway/backend_cache.py
#	cellxgene_gateway/cache_entry.py
#	cellxgene_gateway/env.py
#	cellxgene_gateway/gateway.py
#	cellxgene_gateway/subprocess_backend.py
#	tests/test_cache_entry.py
#	tests/test_dir_util.py

tests/test_cache_entry.py

@@ -1,11 +1,15 @@
 import unittest
-from cellxgene_gateway.cache_entry import CacheEntry
+from cellxgene_gateway.cache_entry import CacheEntry, CacheEntryStatus
 from cellxgene_gateway.cache_key import CacheKey
 
 key = CacheKey("czi/pbmc3k.h5ad", "pbmc3k.h5ad", "tmp.csv")
 
 
 class TestRenderEntry(unittest.TestCase):
+    def test_GIVEN_key_and_port_THEN_returns_loading_CacheEntry(self):
+        entry = CacheEntry.for_key("some-key", 1)
+        self.assertEqual(entry.status, CacheEntryStatus.loading)
+
     def test_GIVEN_absolute_static_url_THEN_include_path(self):
         actual = CacheEntry.for_key(key, 8000).rewrite_text_content(
             "src:url(/static/assets/"
@@ -21,3 +25,7 @@ class TestRenderEntry(unittest.TestCase):
         )
         expected = '<link rel="shortcut icon" href="http://localhost:5005/view/czi/pbmc3k.h5ad/static/assets/favicon.ico">'
         self.assertEqual(actual, expected)
+
+
+if __name__ == "__main__":
+    unittest.main()

tests/test_extra_scripts.py

@@ -1,5 +1,6 @@
 import unittest
 from unittest.mock import MagicMock, patch
+
 from cellxgene_gateway.extra_scripts import get_extra_scripts
 
 

tests/test_filecrawl.py

@@ -0,0 +1,46 @@
+import unittest
+from unittest.mock import MagicMock, patch
+
+from cellxgene_gateway.filecrawl import render_entry
+
+
+class TestRenderEntry(unittest.TestCase):
+    def test_GIVEN_path_both_slash_THEN_view_has_single_slash(self):
+        entry = {
+            "path": "/somepath/",
+            "name": "entry",
+            "type": "file",
+            "annotations": [],
+        }
+        rendered = render_entry(entry)
+        self.assertIn("view/somepath", rendered)
+
+    def test_GIVEN_path_starts_slash_THEN_view_has_single_slash(self):
+        entry = {
+            "path": "/somepath",
+            "name": "entry",
+            "type": "file",
+            "annotations": [],
+        }
+        rendered = render_entry(entry)
+        self.assertIn("view/somepath", rendered)
+
+    def test_GIVEN_path_ends_slash_THEN_view_has_single_slash(self):
+        entry = {
+            "path": "somepath/",
+            "name": "entry",
+            "type": "file",
+            "annotations": [],
+        }
+        rendered = render_entry(entry)
+        self.assertIn("view/somepath", rendered)
+
+    def test_GIVEN_path_no_slash_THEN_view_has_single_slash(self):
+        entry = {
+            "path": "somepath",
+            "name": "entry",
+            "type": "file",
+            "annotations": [],
+        }
+        rendered = render_entry(entry)
+        self.assertIn("view/somepath", rendered)

tests/test_prune_process_cache.py

@@ -1,7 +1,8 @@
 import unittest
 from unittest.mock import MagicMock, patch
-from cellxgene_gateway.cache_entry import CacheEntry
+
 from cellxgene_gateway.backend_cache import BackendCache
+from cellxgene_gateway.cache_entry import CacheEntry
 
 
 class TestPruneProcessCache(unittest.TestCase):