Skip to content

Commit

Permalink
Merge pull request #60 from sbesson/mox3_removal
Browse files Browse the repository at this point in the history
Remove mox3 from the test requirements
  • Loading branch information
jburel authored Jan 17, 2024
2 parents 2acb825 + 77c384c commit eb785c6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 22 deletions.
5 changes: 4 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,5 +128,8 @@ def read(fname):
download_url='%s/v%s.tar.gz' % (url, version),
keywords=['OMERO.CLI', 'plugin'],
cmdclass={'test': PyTest},
tests_require=['pytest', 'restview', 'mox3'],
tests_require=[
'omero-py>=5.18.0',
'pytest',
'restview'],
)
22 changes: 1 addition & 21 deletions test/integration/clitest/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,28 +24,8 @@
import pytest

import omero
from omero.cli import CLI
from omero.plugins.sessions import SessionsControl
from omero.rtypes import rstring

from omero.testlib import ITest
from mox3 import mox


class AbstractCLITest(ITest):

@classmethod
def setup_class(cls):
super(AbstractCLITest, cls).setup_class()
cls.cli = CLI()
cls.cli.register("sessions", SessionsControl, "TEST")

def setup_mock(self):
self.mox = mox.Mox()

def teardown_mock(self):
self.mox.UnsetStubs()
self.mox.VerifyAll()
from omero.testlib.cli import AbstractCLITest


class CLITest(AbstractCLITest):
Expand Down

0 comments on commit eb785c6

Please sign in to comment.