Permalink
Browse files

Merge pull request #1518 from peternewman/master-resync

Master resync
  • Loading branch information...
peternewman committed Nov 28, 2018
2 parents b31846b + 297300e commit 9d6962d3f6f0ab80f9e09226d20ca8eb222e71ca
Showing with 3 additions and 3 deletions.
  1. +1 −1 .travis.yml
  2. +1 −1 tools/rdm/TestDefinitions.py
  3. +1 −1 tools/rdm/rdm_responder_test.py
@@ -314,7 +314,7 @@ install:
before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
#Fix a broken homebrew libtool install
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew reinstall -s libtool; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew reinstall libtool; fi
#Fix a broken homebrew python upgrade - see https://github.com/Homebrew/homebrew-core/issues/26358
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade python || true; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache bison flex liblo libmicrohttpd; fi # ossp-uuid, homebrew/python/numpy and libusb already present
@@ -2107,7 +2107,7 @@ class GetOutOfRangeDMXPersonalityDescription(TestMixins.GetOutOfRangeByteMixin,
"""GET the personality description for the N + 1 personality."""
PID = 'DMX_PERSONALITY_DESCRIPTION'
REQUIRES = ['personality_count']
LABEL = 'personalities'
LABEL = 'personality descriptions'
class AllSubDevicesGetDMXPersonalityDescription(
@@ -295,7 +295,7 @@ def UIDList(state, uids):
wrapper.Reset()
if not uid_ok:
sys.exit()
sys.exit(1)
test_filter = None
if options.tests is not None:

0 comments on commit 9d6962d

Please sign in to comment.