Bladeren bron

[abfs] Port get_url tests to the new signature

Romain Rigaux 4 jaren geleden
bovenliggende
commit
ed3652cbb8

+ 1 - 0
desktop/core/src/desktop/lib/fs/__init__.py

@@ -22,6 +22,7 @@ from builtins import filter
 import posixpath
 import sys
 
+from desktop.lib.fs.proxyfs import ProxyFS  # Imported later from this module
 
 if sys.version_info[0] > 2:
   from urllib.parse import urlparse as lib_urlparse

+ 0 - 3
desktop/core/src/desktop/lib/rest/raz_http_client.py

@@ -48,9 +48,6 @@ class RazHttpClient(HttpClient):
     """
     raz_client = AdlsRazClient(username=self.username)
 
-    container = 'hue'
-    storage_account = 'gethue.dfs.core.windows.net'
-
     url = self._make_url(path, params)
 
     token = raz_client.get_url(action=http_method, path=url, headers=headers)

+ 14 - 5
desktop/core/src/desktop/lib/rest/raz_http_client_test.py

@@ -38,12 +38,21 @@ class TestRazHttpClient():
           'sig=pJL%2FWyed41tptiwBM5ymYre4qF8wzrO05tS5MCjkutc%3D&st=2015-01-02T01%3A40%3A51Z&se=2015-01-02T02%3A00%3A51Z&sp=r'
         execute.return_value = 'my file'
 
-        client = RazHttpClient()
+        client = RazHttpClient(username='test', base_url='https://gethue.blob.core.windows.net')
         f = client.execute(http_method='GET', path='/gethue/data/customer.csv')
 
         assert_equal('my file', f)
-        get_url.assert_called_with('gethue.dfs.core.windows.net', 'hue', relative_path='/gethue/data/customer.csv', perm='read')
-        execute.assert_called_with(http_method='GET', path='https://gethue.blob.core.windows.net/hue/data/customer.csv?' + \
-          'sv=2014-02-14&sr=b&sig=pJL%2FWyed41tptiwBM5ymYre4qF8wzrO05tS5MCjkutc%3D&' + \
-          'st=2015-01-02T01%3A40%3A51Z&se=2015-01-02T02%3A00%3A51Z&sp=r'
+        get_url.assert_called_with(action='GET', path='https://gethue.blob.core.windows.net/gethue/data/customer.csv', headers=None)
+        execute.assert_called_with(
+            http_method='GET',
+            path='/gethue/data/customer.csv&https://gethue.blob.core.windows.net/hue/data/customer.csv?sv=2014-02-14&sr=b&sig=pJL%2FWyed41tptiwBM5ymYre4qF8wzrO05tS5MCjkutc%3D&st=2015-01-02T01%3A40%3A51Z&se=2015-01-02T02%3A00%3A51Z&sp=r',
+            params=None,
+            data=None,
+            headers=None,
+            allow_redirects=False,
+            urlencode=True,
+            files=None,
+            stream=False,
+            clear_cookies=False,
+            timeout=120
         )