getImagesBySplitFilesets Attribute Error

[omero-qa]

​http://qa.openmicroscopy.org.uk/qa/feedback/7297/

Traceback (most recent call last):

  File "/home/omero/slave/workspace/OMERO-merge-develop/src/dist/lib/python/django/core/handlers/base.py", line 111, in get_response
    response = callback(request, *callback_args, **callback_kwargs)

  File "/home/omero/slave/workspace/OMERO-merge-develop/src/dist/lib/python/omeroweb/decorators.py", line 387, in wrapped
    retval = f(request, *args, **kwargs)

  File "/home/omero/slave/workspace/OMERO-merge-develop/src/dist/lib/python/omeroweb/decorators.py", line 424, in wrapper
    context = f(request, *args, **kwargs)

  File "/home/omero/slave/workspace/OMERO-merge-develop/src/dist/lib/python/omeroweb/webclient/views.py", line 2638, in fileset_check
    splitFilesets = conn.getContainerService().getImagesBySplitFilesets(dtypeIds, conn.SERVICE_OPTS)

  File "/home/omero/slave/workspace/OMERO-merge-develop/src/dist/lib/python/omero/gateway/__init__.py", line 3685, in __getattr__
    rv = getattr(obj, attr)

AttributeError: 'IContainerPrx' object has no attribute 'getImagesBySplitFilesets'


<WSGIRequest
GET:<QueryDict: {u'Plate': [u'3']}>,
POST:<QueryDict: {}>,
COOKIES:{'sessionid': '273af8a3ad0baa8ecd5113d818665fe7'},
META:{'DOCUMENT_ROOT': '/htdocs',
 'GATEWAY_INTERFACE': 'CGI/1.1',
 'HTTPS': 'on',
 'HTTP_ACCEPT': '*/*',
 'HTTP_ACCEPT_ENCODING': 'gzip, deflate',
 'HTTP_ACCEPT_LANGUAGE': 'en-US,en;q=0.5',
 'HTTP_CONNECTION': 'keep-alive',
 'HTTP_COOKIE': 'sessionid=273af8a3ad0baa8ecd5113d818665fe7',
 'HTTP_DNT': '1',
 'HTTP_HOST': 'gretzky.openmicroscopy.org.uk',
 'HTTP_REFERER': 'https://gretzky.openmicroscopy.org.uk/omero/webclient/',
 'HTTP_USER_AGENT': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:21.0) Gecko/20100101 Firefox/21.0',
 'HTTP_X_REQUESTED_WITH': 'XMLHttpRequest',
 'PATH': '/usr/local/bin:/usr/bin:/bin',
 'PATH_INFO': u'/webclient/fileset_check/delete/',
 'PATH_TRANSLATED': '/htdocs/webclient/fileset_check/delete/',
 'QUERY_STRING': 'Plate=3',
 'REMOTE_ADDR': '94.172.186.254',
 'REMOTE_PORT': '49832',
 'REQUEST_METHOD': 'GET',
 'REQUEST_URI': '/omero/webclient/fileset_check/delete/?Plate=3',
 'SCRIPT_FILENAME': '/home/omero/OMERO-CURRENT/var/omero.fcgi',
 'SCRIPT_NAME': u'/omero',
 'SCRIPT_URI': 'https://gretzky.openmicroscopy.org.uk/omero/webclient/fileset_check/delete/',
 'SCRIPT_URL': '/omero/webclient/fileset_check/delete/',
 'SERVER_ADDR': '134.36.65.227',
 'SERVER_ADMIN': '[no address given]',
 'SERVER_NAME': 'gretzky.openmicroscopy.org.uk',
 'SERVER_PORT': '443',
 'SERVER_PROTOCOL': 'HTTP/1.1',
 'SERVER_SIGNATURE': '<address>Apache/2.2.14 (Ubuntu) Server at gretzky.openmicroscopy.org.uk Port 443</address>\n',
 'SERVER_SOFTWARE': 'Apache/2.2.14 (Ubuntu)',
 'SSL_TLS_SNI': 'gretzky.openmicroscopy.org.uk',
 'wsgi.errors': <flup.server.fcgi_base.TeeOutputStream object at 0x3b430d0>,
 'wsgi.input': <flup.server.fcgi_base.InputStream object at 0x3f37d90>,
 'wsgi.multiprocess': True,
 'wsgi.multithread': False,
 'wsgi.run_once': False,
 'wsgi.url_scheme': 'https',
 'wsgi.version': (1, 0)}>

[wmoore]

Simply caused by merge conflict meaning Mark's PR wasn't in the merge build