Merge pull request #1559 from ximenesuk/pytest-integration

Change all tests under integration to use pytest idioms.

components/tools/OmeroPy/build.xml

@@ -30,7 +30,9 @@
 
     <target name="test" depends="python-test" unless="env.NOPYTHON"/>
 
-    <target name="integration" depends="python-integration" unless="env.NOPYTHON"/>
+    <target name="integration" depends="python-integration" unless="env.NOPYTHON">
+        <property name="MARK" value=""/>
+    </target>
 
     <target name="tools-init" unless="env.NOPYTHON">
         <get-source todir="${copy.dir}">

components/tools/OmeroPy/test/gatewaytest/test_image.py

@@ -225,7 +225,6 @@ def testExport (self, gatewaywrapper):
         finally:
             gatewaywrapper.loginAsAdmin()
             admin = gatewaywrapper.gateway.getAdminService()
-            admin.removeGroups(omero.model.ExperimenterI(uid, False), [g])
 
 
 

components/tools/OmeroPy/test/gatewaytest/test_multi_group.py

@@ -54,7 +54,7 @@ def searchHistory(self, gateway, start, end, dtype="Dataset"):
         assert typeCount ==  dataCount, "Period count should match number of objects"
         assert logCount ==  dataCount, "Logs count should match number of objects"
 
-
+    @pytest.mark.xfail(reason="ticket 11494")
     def testCreateHistory(self, gatewaywrapper):
 
         # Login as user...

components/tools/OmeroPy/test/gatewaytest/test_performance.py

@@ -16,13 +16,16 @@
 
 """
 
+import pytest
 import omero
 import time
 
 
 from omero.rtypes import rstring, rlong
 
 class TestPerformance (object):
+
+    @pytest.mark.xfail(reason="ticket 11494")
     def testListFileAnnotations(self, gatewaywrapper):
         """ testListFileAnnotations: test speed of getObjects('FileAnnotation') vv listFileAnnotations() """
         gatewaywrapper.loginAsAuthor()

components/tools/OmeroPy/test/gatewaytest/test_ticket10618.py

@@ -80,7 +80,7 @@ def dynamic_test(self, perms=perms, testertype=testertype,
             conn.SERVICE_OPTS.setOmeroGroup(str(-1))
 
         img = conn.getObject("Image", image.id)
-        self.assertTrue(img.getThumbnail(size=size, direct=direct))
+        assert img.getThumbnail(size=size, direct=direct)
 
     test_name = "test_%s_%s_dir%s_grp%s_%s" % \
                 (perms, testertype, direct, grpctx, size)

components/tools/OmeroPy/test/gatewaytest/test_user.py

@@ -97,7 +97,6 @@ def testCrossGroupSave (self, gatewaywrapper):
             admin = gatewaywrapper.gateway.getAdminService()
             # Revert group permissions and remove user from group
             admin.changePermissions(g._obj, omero.model.PermissionsI(perms))
-            admin.removeGroups(omero.model.ExperimenterI(uid, False), [g._obj])
 
     def testCrossGroupRead (self, gatewaywrapper):
         gatewaywrapper.loginAsAuthor()

components/tools/OmeroPy/test/integration/clitest/test_script.py

@@ -9,19 +9,19 @@
 
 """
 
-import unittest, os, subprocess, StringIO
+import os, subprocess, StringIO
 from path import path
 from omero.cli import Context, BaseControl, CLI
 from omero.plugins.script import ScriptControl
 from omero.plugins.sessions import SessionsControl
 from omero.plugins.upload import UploadControl
 from omero.util.temp_files import create_path
-from integration.library import ITest
+import test.integration.library as lib
 
 omeroDir = path(os.getcwd()) / "build"
 
 
-class TestScript(ITest):
+class TestScript(lib.ITest):
 
     def cli(self):
         cli = CLI()
@@ -100,6 +100,3 @@ def testReplaceOfficial(self):
         replaceArgs = args + ["replace", str(newId), str(p)]
         # print replaceArgs
         cli.invoke(replaceArgs, strict=True)
-
-if __name__ == '__main__':
-    unittest.main()

components/tools/OmeroPy/test/integration/cmdtest/test_chgrp.py

@@ -11,13 +11,12 @@
 """
 
 import omero
-import unittest
+import test.integration.library as lib
 
-from integration.library import ITest
 from omero.callbacks import CmdCallbackI
 
 
-class ChgrpTest(ITest):
+class ChgrpTest(lib.ITest):
 
     def testChgrpImage(self):
 
@@ -39,6 +38,3 @@ def testChgrpImage(self):
 
         # Check Data
         query.get("Image", img.id.val)
-
-if __name__ == '__main__':
-    unittest.main()

components/tools/OmeroPy/test/integration/cmdtest/test_columbus.py

@@ -24,13 +24,12 @@
 """
 
 import omero
-import unittest
+import test.integration.library as lib
 
-from integration.library import ITest
 from omero.callbacks import CmdCallbackI
 
 
-class ColumbusTest(unittest.TestCase):
+class ColumbusTest(lib.ITest):
     """
     The following tests all assume the following
     user configuration:
@@ -157,6 +156,3 @@ def test10(self):
         group admin b:D should not have access to data that is owned by A and
         only shared with users in group b but not with group b.
         """
-
-if __name__ == '__main__':
-    unittest.main()