Fix one flaky test, bump project version

CMakeLists.txt

@@ -23,7 +23,7 @@ if (NOT DEFINED OIOSDS_RELEASE)
 	set(OIOSDS_RELEASE master)
 endif ()
 if (NOT DEFINED OIOSDS_PROJECT_VERSION_SHORT)
-	set(OIOSDS_PROJECT_VERSION_SHORT "6.0")
+	set(OIOSDS_PROJECT_VERSION_SHORT "6.1")
 endif ()
 
 set(OIOSDS_PROJECT_VERSION "${OIOSDS_RELEASE}/${OIOSDS_PROJECT_VERSION_SHORT}")

tests/functional/conscience/test_conscience.py

@@ -16,9 +16,10 @@
 import logging
 import random
 
+from flaky import flaky
+from oio.common.json import json
 from tests.utils import BaseTestCase
 from tests.utils import CODE_SRVTYPE_NOTMANAGED
-import simplejson as json
 
 
 class TestConscienceFunctional(BaseTestCase):
@@ -264,6 +265,7 @@ def test_lock_survives_conscience_restart(self):
         self.assertEqual(1, my_rawx['score'])
         self.conscience.unlock_score(one_rawx)
 
+    @flaky()
     def test_deregister_services(self):
         self._flush_cs('echo')
         self._reload()
@@ -272,6 +274,8 @@ def test_deregister_services(self):
         expected_services.append(self._srv('echo', ip='127.0.0.2'))
         expected_services.append(self._srv('echo', ip='127.0.0.3'))
         self._register_srv(expected_services)
+        # Sometimes the proxy's service registration thread is slow,
+        # and we get only a partial list, hence the flaky decorator.
         services = self._list_srvs('echo')
         self.assertListEqual(
             sorted([srv['addr'] for srv in expected_services]),