Update version in setup and documents, fix tests

diff --git a/docs/conf.py b/docs/conf.py
index 52d901b..6cb314c 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -113,7 +113,7 @@ copyright = u'2013, GRNET'
 # built documents.
 #
 # The short X.Y version.
-version = '0.10'
+version = '0.11'
 # The full version, including alpha/beta/rc tags.
 try:
     import kamaki

diff --git a/kamaki/clients/livetest/astakos.py b/kamaki/clients/livetest/astakos.py
index 150c844..0a42510 100644 (file)
--- a/kamaki/clients/livetest/astakos.py
+++ b/kamaki/clients/livetest/astakos.py
@@ -42,7 +42,6 @@ class Astakos(livetest.Generic):
         self.cloud = 'cloud.%s' % self['testcloud']
         self.client = AstakosClient(
             self[self.cloud, 'url'], self[self.cloud, 'token'])
-        print 'WHA?', self['astakos', 'details']
         with open(self['astakos', 'details']) as f:
             self._astakos_details = eval(f.read())
 

diff --git a/kamaki/clients/livetest/cyclades.py b/kamaki/clients/livetest/cyclades.py
index b9482f7..a0565c3 100644 (file)
--- a/kamaki/clients/livetest/cyclades.py
+++ b/kamaki/clients/livetest/cyclades.py
@@ -398,8 +398,8 @@ class Cyclades(livetest.Generic):
     def _test_0160_get_image_metadata(self):
         r = self.client.get_image_metadata(self.img)
         self.assert_dicts_are_equal(
-            self.img_details['metadata'], r)
-        for key, val in self.img_details['metadata'].items():
+            self.img_details['properties'], r)
+        for key, val in self.img_details['properties'].items():
             r = self.client.get_image_metadata(self.img, key)
             self.assertEqual(r[key], val)
 

diff --git a/version b/version
index 204c301..91b6375 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.10next
+0.11rc1