Adding test for clonable shared models

Author: mmerce

bigml/api_handlers/resourcehandler.py

@@ -850,9 +850,11 @@ def _set_clone_from_args(self, origin, resource_type, args=None,
         if args is not None:
             create_args.update(args)
 
-        attr = "shared_hash" if origin_id.startswith("shared") else "origin"
-        if attr == "shared_hash":
+        if origin["object"].get("shared_hash"):
+            attr = "shared_hash"
             origin_id = origin["object"][attr]
+        else:
+            attr = "origin"
         create_args.update({attr: origin_id})
 
         return create_args

bigml/tests/create_model_steps.py

@@ -151,10 +151,14 @@ def model_from_public_url(step):
     eq_(get_status(world.model)['code'], FINISHED)
 
 
-def make_the_model_shared(step):
+def make_the_model_shared(step, cloneable=False):
     """Step: I make the model shared"""
+    shared = {'shared': True}
+    if cloneable:
+        shared.update({"shared_clonable": True})
     resource = world.api.update_model(world.model['resource'],
-                                      {'shared': True})
+                                      shared)
+    world.api.ok(resource)
     world.status = resource['code']
     eq_(world.status, HTTP_ACCEPTED)
     world.location = resource['location']
@@ -644,6 +648,7 @@ def clone_model(step, model):
     # save reference
     world.models.append(resource['resource'])
 
+
 def the_cloned_model_is(step, model):
     """Checking the model is a clone"""
     eq_(world.model["origin"], model)

bigml/tests/test_46_model_cloning.py

@@ -62,7 +62,11 @@ def test_scenario1(self):
             And I wait until the dataset is ready less than <dataset_wait> secs
             And I create a model
             And I wait until the model is ready less than <model_wait> secs
+            And I clone the model
             Then the origin model is the previous model
+            And I share and clone the shared model
+            Then the origin model is the previous model
+
         """
         show_doc(self.test_scenario1)
         headers = ["data", "source_wait", "dataset_wait", "model_wait"]
@@ -80,10 +84,14 @@ def test_scenario1(self):
                 self, example["dataset_wait"], shared=example["data"])
             model_create.i_create_a_model(self, shared=example["data"])
             model_create.the_model_is_finished_in_less_than(
-                self, example["model_wait"], shared=example["data"])
+                self, example["model_wait"])
             model = world.model["resource"]
+            model_create.make_the_model_shared(self, cloneable=True)
+            model_hash = "shared/model/%s" % world.model["shared_hash"]
             model_create.clone_model(self, model)
             model_create.the_cloned_model_is(self, model)
+            model_create.clone_model(self, model_hash)
+            model_create.the_cloned_model_is(self, model)
 
     def test_scenario2(self):
         """