Merge lp:~elopio/cloudspacesclient/delete_file into lp:cloudspacesclient

[Leo Arias]

Added the test to delete a file.

[lp:~elopio/cloudspacesclient/delete_file]

34. By Leo Arias on 2013-12-04

Fixed pep8.

[Richard Huddie (rhuddie)]

LGTM

review: Approve

=== modified file 'src/cloudspacesclient/config/cloudspaces.conf'
--- src/cloudspacesclient/config/cloudspaces.conf	2013-12-04 14:55:38 +0000
+++ src/cloudspacesclient/config/cloudspaces.conf	2013-12-04 16:26:34 +0000
@@ -1,7 +1,7 @@
 [cloudspaces]
-cloudspaces_server_url = http://u1.local:8003
-#cloudspaces_server_url = http://u1-precise.local:8003
-cloudspaces_server_adapter = cloudspacesclient.ubuntuone.UbuntuOneServer
+#cloudspaces_server_url = http://u1.local:8003
+cloudspaces_server_url = http://u1-precise:38096
+cloudspaces_server_adapter = cloudspacesclient.ubuntuone.UbuntuOneServerWithExistingUser
 
 [ubuntuone]
 sso_server_url = http://sso.local:8001
@@ -10,3 +10,7 @@
 ubuntuone_server_url = http://u1.local:8003
 #ubuntuone_server_url = http://u1-precise.local:8003
 #ubuntuone_server_url = https://staging.one.ubuntu.com
+consumer_key = ubuntuone
+consumer_secret = hammertime
+token_key = jqRRrGlhjxscp8tf45L0
+token_secret = 849ccNm3VKcgvxm49CmnvV6t0Gs4cSrgzJscrglcjFhFd5TKt293jJTHkSMRhbwFZSp7vnR077cx4cQ9

=== modified file 'src/cloudspacesclient/tests/conformance/test_cloudspaces_api.py'
--- src/cloudspacesclient/tests/conformance/test_cloudspaces_api.py	2013-12-04 14:55:38 +0000
+++ src/cloudspacesclient/tests/conformance/test_cloudspaces_api.py	2013-12-04 16:26:34 +0000
@@ -285,6 +285,36 @@
         # TODO check the user_id. --elopio - 2013-11-27
         # TODO Check the volume_id field. --elopio - 2013-11-27
 
+    def test_delete_file(self):
+        root_node_id, root_path = self._get_root_info()
+        test_file_name = 'test_file_to_delete.txt'
+        test_file_mimetype = 'text/plain'
+
+        create_metadata = self.cloudspaces_api_client.make_file(
+            root_node_id, test_file_name)
+        file_node_id = create_metadata.get('node_id')
+        delete_metadata = self.cloudspaces_api_client.delete(file_node_id)
+
+        # We don't check the version of the file after it is deleted, as it
+        # depends on the provider's implementation.
+        expected = dict(
+            hash=None, filename=test_file_name, is_deleted=True,
+            is_folder=False, mimetype=test_file_mimetype,
+            parent_node_id=root_node_id, path=root_path, size=0)
+        self._assert_json_object_values(expected, delete_metadata)
+
+        self._assert_content_path(
+            file_node_id, delete_metadata.get('content_path'))
+        self._assert_resource_path(
+            file_node_id, delete_metadata.get('resource_path'))
+        # Assert that the file has just been modified.
+        self._assert_datetime_limits(
+            parser.parse(delete_metadata.get('server_modified')),
+            self.start_datetime,
+            self._get_now_datetime())
+        # TODO check the user_id. --elopio - 2013-11-27
+        # TODO Check the volume_id field. --elopio - 2013-11-27
+
     def test_delete_folder_in_root(self):
         # get the root node id and root folder name
         root_node_id, root_name = self._get_root_info()