fix: integration tests fixed (#685)

* fix: integration tests fixed

* test order update

Author: jsam

.travis.yml

@@ -42,8 +42,8 @@ python:
   - "3.7"
 
 stages:
-  - name: test
   - name: docs
+  - name: test
   - name: integration
     if: branch = master AND (type != pull_request)
   - name: test OSX

renku/cli/_providers/__init__.py

@@ -38,35 +38,35 @@ def from_uri(uri):
                 return None, 'Cannot parse URL.'
 
         provider = None
-        warning = ''
+        err = ''
 
         for _, potential_provider in ProviderFactory.PROVIDERS.items():
             try:
                 if potential_provider.supports(uri):
                     provider = potential_provider
                     break
             except (Exception, BaseException) as e:
-                warning += 'Couldn\'t test provider {prov}: {err}\n'.format(
+                err += 'Couldn\'t test provider {prov}: {err}\n'.format(
                     prov=potential_provider, err=e
                 )
 
         supported_providers = ', '.join(ProviderFactory.PROVIDERS.keys())
 
         if is_doi_ and provider is None:
             return None, (
-                warning + 'Provider {} not found. '.format(
+                err + 'Provider {} not found. '.format(
                     uri.split('/')[1].split('.')[0]  # Get DOI provider name.
                 ) + 'Currently supporting following providers: {}'.
                 format(supported_providers)
             )
         elif provider is None:
             return None, (
-                warning + 'Provider not found for {}. '.format(uri) +
+                err + 'Provider not found for {}. '.format(uri) +
                 'Currently supporting following providers: {}'.
                 format(supported_providers)
             )
         else:
-            return provider(is_doi=is_doi_), warning
+            return provider(is_doi=is_doi_), err
 
     @staticmethod
     def from_id(provider_id):

renku/cli/dataset.py

@@ -572,18 +572,15 @@ def import_(ctx, client, uri, name, extract):
     provider, err = ProviderFactory.from_uri(uri)
     if err and provider is None:
         raise BadParameter('Could not process {0}.\n{1}'.format(uri, err))
-    elif err:
-        click.echo(WARNING + err)
 
     try:
-
         record = provider.find_record(uri)
-        dataset_ = record.as_dataset(client)
-        files_ = dataset_.files
+        dataset = record.as_dataset(client)
+        files = dataset.files
 
         click.echo(
             tabulate(
-                files_,
+                files,
                 headers=OrderedDict((
                     ('checksum', None),
                     ('filename', 'name'),
@@ -613,7 +610,7 @@ def import_(ctx, client, uri, name, extract):
 
     click.confirm(text_prompt, abort=True)
 
-    if files_:
+    if files:
         data_folder = tempfile.mkdtemp()
 
         pool_size = min(
@@ -653,7 +650,7 @@ def _init(lock, id_queue):
                     data_folder,
                     file_,
                 )
-            ) for file_ in files_
+            ) for file_ in files
         ]
 
         try:
@@ -667,13 +664,13 @@ def _init(lock, id_queue):
             ))
         pool.close()
 
-        dataset_name = name or dataset_.display_name
+        dataset_name = name or dataset.display_name
         if write_dataset(client, dataset_name):
             add_to_dataset(
                 client,
                 urls=[str(p) for p in Path(data_folder).glob('*')],
                 name=dataset_name,
-                with_metadata=dataset_
+                with_metadata=dataset
             )
 
             click.secho('OK', fg='green')