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

[Leo Arias]

Do not check the versions on the conformance tests.
Do not check the creation date of the first version of the file on the edit test.

I have a test that uploads a file and checks the server modified time, so we don't need it in this test. I'll make sure to propose it before leaving today.

[Richard Huddie (rhuddie)]

review: Approve

=== modified file 'src/cloudspacesclient/tests/conformance/test_cloudspaces_api.py'
--- src/cloudspacesclient/tests/conformance/test_cloudspaces_api.py	2013-12-06 15:02:38 +0000
+++ src/cloudspacesclient/tests/conformance/test_cloudspaces_api.py	2013-12-06 15:29:27 +0000
@@ -99,20 +99,20 @@
 
 class TestCaseWithRootNodeInfo(BaseCloudspacesAPITestCase):
 
+    # We never check the version number on the tests because it depends on the
+    # server implementation. It not necessarily starts in 1, and increase by 1
+    # on every change.
+
     def setUp(self):
         super(TestCaseWithRootNodeInfo, self).setUp()
         self.root_node_id = self._get_root_node_id()
 
     def _get_root_node_id(self):
         user_rep = self.cloudspaces_api_client.get_user_representation()
-        root_volume = self._get_root_volume(user_rep.get('volumes'))
+        # Just use the first volume for the tests.
+        root_volume = user_rep.get('volumes')[0]
         return root_volume.get('node_id')
 
-    def _get_root_volume(self, volumes):
-        # FIXME The first volume returned is not necessarily the root.
-        # --elopio - 2013-11-23
-        return volumes[0]
-
     def test_get_root_metadata(self):
         metadata = self.cloudspaces_api_client.get_metadata(self.root_node_id)
 
@@ -197,7 +197,7 @@
         root_path = self.test_server.get_root_path()
         expected = dict(
             is_folder=True, is_deleted=False, is_root=False, path=root_path,
-            filename=folder_name, parent_node_id=self.root_node_id, version=1)
+            filename=folder_name, parent_node_id=self.root_node_id)
         self._assert_json_object_values(expected, metadata)
 
     def test_create_folder_no_parent_id(self):
@@ -213,7 +213,7 @@
         root_path = self.test_server.get_root_path()
         expected = dict(
             is_folder=True, is_deleted=False, is_root=False, path=root_path,
-            filename=folder_name, parent_node_id=self.root_node_id, version=1)
+            filename=folder_name, parent_node_id=self.root_node_id)
         self._assert_json_object_values(expected, metadata)
 
     def test_create_child_folder(self):
@@ -235,7 +235,7 @@
 
         expected = dict(
             is_folder=True, is_deleted=False, is_root=False,
-            path=child_folder_path, filename=child_folder_name, version=2)
+            path=child_folder_path, filename=child_folder_name)
         self._assert_json_object_values(expected, metadata)
 
     def test_create_new_file(self):
@@ -252,8 +252,7 @@
         expected = dict(
             hash=None, filename=test_file_name, is_deleted=False,
             is_folder=False, mimetype=test_file_mimetype,
-            parent_node_id=self.root_node_id, path=root_path, size=0,
-            version=1)
+            parent_node_id=self.root_node_id, path=root_path, size=0)
         self._assert_json_object_values(expected, metadata)
 
         # Assert that the file has just been created.
@@ -287,8 +286,6 @@
         delete_metadata = self.cloudspaces_api_client.delete(file_node_id)
 
         root_path = self.test_server.get_root_path()
-        # 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,
@@ -317,7 +314,7 @@
         root_path = self.test_server.get_root_path()
         expected = dict(
             is_folder=True, is_deleted=True, is_root=False,
-            path=root_path, filename=folder_name, version=2)
+            path=root_path, filename=folder_name)
         self._assert_json_object_values(expected, metadata)
 
     def test_delete_non_existent_object(self):
@@ -445,17 +442,9 @@
         # load version 1 of the file
         metadata = self.cloudspaces_api_client.put_file(
             file_node_id, content_v1)
-        # check correct version
-        self.assertEqual(metadata.get('version'), 2)
-        # Assert that the file has just been created.
-        self.assert_datetime_limits(
-            parser.parse(metadata.get('server_modified')), self.start_datetime,
-            self._get_now_datetime())
         # load version 2 of the file
         metadata = self.cloudspaces_api_client.put_file(
             file_node_id, content_v2)
-        # check correct version
-        self.assertEqual(metadata.get('version'), 3)
         # Assert that the file has just been updated.
         self.assert_datetime_limits(
             parser.parse(metadata.get('server_modified')), self.start_datetime,