Skip to content
This repository has been archived by the owner on Apr 7, 2022. It is now read-only.

Fix issues in setup file #94

Merged
merged 3 commits into from
Jan 31, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

from distutils.command.build import build as dftbuild
from distutils.unixccompiler import UnixCCompiler
from distutils.version import StrictVersion as V
from distutils.version import LooseVersion as V

# Sphinx imports
try:
Expand Down Expand Up @@ -422,17 +422,20 @@ def setup_args():
'six',
]

setup_requires = [
'pytest-runner' if TESTING else '',
]
setup_requires = []

if TESTING:
setup_requires += ['pytest-runner']

tests_require = [
'pytest-xdist',
'gevent',
'psutil',
'trollius' if PYTHON2 else '',
]

if PYTHON2:
tests_require += ['trollius']

package_data = {
'PyTango': [],
}
Expand Down
2 changes: 1 addition & 1 deletion tests/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ def test_read_attribute(tango_test, readable_attribute):
# This is a hack:
# Without this sleep, the following error is very likely to be raised:
# -> MARSHAL CORBA system exception: MARSHAL_PassEndOfMessage
if readable_attribute == "string_image_ro":
if readable_attribute in ["string_image_ro", "string_spectrum_ro"]:
sleep(0.05)
tango_test.read_attribute(readable_attribute, wait=True)

Expand Down
8 changes: 5 additions & 3 deletions tests/test_event.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,10 @@ def callback(evt):
"attr", EventType.CHANGE_EVENT, callback, wait=True)
event_device.command_inout("send_event", wait=True)
# Wait for tango event
event_device.read_attribute("state", wait=True)
event_device.read_attribute("state", wait=True)
event_device.read_attribute("state", wait=True)
retries = 10
for _ in range(retries):
event_device.read_attribute("state", wait=True)
if len(results) > 1:
break
# Test the event values
assert results == [0., 1.]