Organize the python code conform with standards

FACode · FACode · commit 41fac37c0475 · 2017-04-20T16:00:22.000+03:00
diff --git a/oca/tests/integration_test_image.py b/oca/tests/integration_test_image.py
@@ -9,7 +9,9 @@
 import oca
 from oca.exceptions import OpenNebulaException
 
-condition = bool(os.environ.get('OCA_INT_TESTS', False)) & bool(os.environ.get('OCA_INT_IMAGE_TESTS', False))
+condition = (bool(os.environ.get(
+    'OCA_INT_TESTS', False)) and bool(os.environ.get(
+        'OCA_INT_IMAGE_TESTS', False)))
 
 
 @unittest.skipUnless(condition, "Skipping integration tests")
@@ -20,7 +22,8 @@ def setUp(self):
         except KeyError:
             pass
 
-        self.c = oca.Client(os.environ['OCA_INT_TESTS_ONE_AUTH'], os.environ['OCA_INT_TESTS_ONE_XMLRPC'])
+        self.c = oca.Client(os.environ['OCA_INT_TESTS_ONE_AUTH'],
+                            os.environ['OCA_INT_TESTS_ONE_XMLRPC'])
 
     def tearDown(self):
         print("teardown")
@@ -31,24 +34,36 @@ def tearDown(self):
                 img.delete()
 
     def test_allocate(self):
-        path = os.environ.get('OCA_INT_TEST_IMAGE_PATH', '~/ttyvd-context.qcow2')
-        # img = oca.Image.allocate(self.c, '<TEMPLATE><NAME>inttest_img_1</NAME><PATH>{p}</PATH></TEMPLATE>'.format(p=path), 1)
+        # path = os.environ.get('OCA_INT_TEST_IMAGE_PATH',
+        # '~/ttyvd-context.qcow2')
 
-        img = oca.Image.allocate(self.c, '<TEMPLATE><NAME>inttest_img_4</NAME><TYPE>DATABLOCK</TYPE><SIZE>382</SIZE></TEMPLATE>', 1)
-        img = oca.Image.allocate(self.c, '<TEMPLATE><NAME>inttest_img_5</NAME><TYPE>DATABLOCK</TYPE><SIZE>382</SIZE></TEMPLATE>', 1)
-        img = oca.Image.allocate(self.c, '<TEMPLATE><NAME>inttest_img_6</NAME><TYPE>DATABLOCK</TYPE><SIZE>382</SIZE></TEMPLATE>', 1)
+        oca.Image.allocate(
+            self.c, '<TEMPLATE><NAME>inttest_img_4</NAME><TYPE>DATABLOCK</TYPE>\
+            <SIZE>382</SIZE></TEMPLATE>', 1)
+
+        oca.Image.allocate(
+            self.c, '<TEMPLATE><NAME>inttest_img_5</NAME><TYPE>DATABLOCK</TYPE>\
+                    <SIZE>382</SIZE></TEMPLATE>', 1)
+        oca.Image.allocate(
+            self.c, '<TEMPLATE><NAME>inttest_img_6</NAME><TYPE>DATABLOCK</TYPE>\
+                    <SIZE>382</SIZE></TEMPLATE>', 1)
 
     def test_allocate_with_same_name(self):
         with self.assertRaises(OpenNebulaException):
-            img = oca.Image.allocate(self.c, '<TEMPLATE><NAME>inttest_img_6</NAME><TYPE>DATABLOCK</TYPE><SIZE>382</SIZE></TEMPLATE>', 1)
-            img = oca.Image.allocate(self.c, '<TEMPLATE><NAME>inttest_img_6</NAME><TYPE>DATABLOCK</TYPE><SIZE>382</SIZE></TEMPLATE>', 1)
+            oca.Image.allocate(
+                self.c, '<TEMPLATE><NAME>inttest_img_6</NAME>\
+                <TYPE>DATABLOCK</TYPE><SIZE>382</SIZE></TEMPLATE>', 1)
+            oca.Image.allocate(
+                self.c, '<TEMPLATE><NAME>inttest_img_6</NAME>\
+                <TYPE>DATABLOCK</TYPE><SIZE>382</SIZE></TEMPLATE>', 1)
 
     def test_update(self):
         imgs = oca.ImagePool(self.c)
         imgs.info()
         for img in imgs:
             if img.name.startswith('inttest'):
-                img.update('<TEMPLATE><NAME>inttest_img_6</NAME><TYPE>DATABLOCK</TYPE><SIZE>382</SIZE></TEMPLATE>')
+                img.update('<TEMPLATE><NAME>inttest_img_6</NAME>\
+                            <TYPE>DATABLOCK</TYPE><SIZE>382</SIZE></TEMPLATE>')
 
     def test_chown(self):
         imgs = oca.ImagePool(self.c)
