wip

slapos/promise/plugin/check_file_state.py

-from zope import interface as zope_interface
+from zope.interface import implementer
 from slapos.grid.promise import interface
 from slapos.grid.promise.generic import GenericPromise
 
 
+@implementer(interface.IPromise)
 class RunPromise(GenericPromise):
-
-  zope_interface.implements(interface.IPromise)
-
   def __init__(self, config):
     GenericPromise.__init__(self, config)
     # SR can set custom periodicity

slapos/test/promise/plugin/test_check_file_state.py

@@ -32,6 +32,7 @@ import tempfile
 import os
 import unittest
 import shutil
+import six
 
 
 class TestCheckFileState(TestPromisePluginMixin):
@@ -67,11 +68,18 @@ extra_config_dict = {
       self.launcher.run()
     result = self.getPromiseResult(self.promise_name)
     self.assertEqual(result['result']['failed'], True)
-    self.assertEqual(
-      result['result']['message'],
-      "ERROR IOError(21, 'Is a directory') "
-      "during opening and reading file %r" % (filename,)
-    )
+    if six.PY3:
+      self.assertEqual(
+        result['result']['message'],
+        "ERROR IsADirectoryError(21, 'Is a directory') "
+        "during opening and reading file %r" % (filename,)
+      )
+    else:
+      self.assertEqual(
+        result['result']['message'],
+        "ERROR IOError(21, 'Is a directory') "
+        "during opening and reading file %r" % (filename,)
+      )
 
   def test_check_file_not_exists(self):
     filename = os.path.join(self.tempdir, 'test.file')
@@ -86,11 +94,18 @@ extra_config_dict = {
       self.launcher.run()
     result = self.getPromiseResult(self.promise_name)
     self.assertEqual(result['result']['failed'], True)
-    self.assertEqual(
-      result['result']['message'],
-      "ERROR IOError(2, 'No such file or directory') "
-      "during opening and reading file %r" % (filename,)
-    )
+    if six.PY3:
+      self.assertEqual(
+        result['result']['message'],
+        "ERROR FileNotFoundError(2, 'No such file or directory') "
+        "during opening and reading file %r" % (filename,)
+      )
+    else:
+      self.assertEqual(
+        result['result']['message'],
+        "ERROR IOError(2, 'No such file or directory') "
+        "during opening and reading file %r" % (filename,)
+      )
 
   def test_check_file_empty(self):
     filename = os.path.join(self.tempdir, 'test.file')