Test and fixup for remove_storage

Author: cderici

juju/model.py

@@ -985,7 +985,7 @@ async def list_storage_pools(self):
             raise JujuError(err.message)
         return [p.serialize() for p in res.results[0].storage_pools]
 
-    async def remove_storage(self, force=False, destroy_storage=False, *storage_ids):
+    async def remove_storage(self,  *storage_ids, force=False, destroy_storage=False):
         """Removes storage from the model.
 
         :param bool force: Remove storage even if it is currently attached
@@ -997,11 +997,13 @@ async def remove_storage(self, force=False, destroy_storage=False, *storage_ids)
             raise JujuError("Expected at least one storage ID")
 
         storage_facade = client.StorageFacade.from_connection(self.connection())
-        return await storage_facade.Remove(storage=[client.RemoveStorageInstance(
+        ret = await storage_facade.Remove(storage=[client.RemoveStorageInstance(
             destroy_storage=destroy_storage,
-            force=False,
-            tag=tag.storage(s)
+            force=force,
+            tag=s,
         ) for s in storage_ids])
+        if ret.results[0].error:
+            raise JujuError(ret.results[0].error.message)
 
     async def remove_application(self, app_name, block_until_done=False):
         """Removes the given application from the model.

tests/integration/test_model.py

@@ -1084,7 +1084,14 @@ async def test_detach_storage(event_loop):
 
         _storage_details_2 = await model.show_storage_details(storage_id)
         storage_details_2 = _storage_details_2[0]
-        assert 'unit-postgresql-0' not in storage_details_2['attachments']
+        assert ('unit-postgresql-0' not in storage_details_2['attachments']) or \
+            storage_details_2['attachments']['unit-postgresql-0'].life == 'dying'
+
+        # remove_storage
+        await model.remove_storage(storage_id)
+        await jasyncio.sleep(10)
+        storages = await model.list_storage()
+        assert all([storage_id not in s['storage-tag'] for s in storages])
 
 
 @base.bootstrapped