Skip to content

Commit

Permalink
Use nosetests to exclude CIQ extension tests from RHEL 6 tox env.
Browse files Browse the repository at this point in the history
  • Loading branch information
gtback committed Jun 29, 2015
1 parent 00c056e commit 370e540
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
12 changes: 1 addition & 11 deletions cybox/test/extensions/location/ciq_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,11 @@

import unittest

from mixbox.binding_utils import etree_
from mixbox.vendor.six import StringIO


class CIQAddressTests(unittest.TestCase):

def test_can_load_extension(self):
if etree_.LXML_VERSION < (2, 3, 0, 0):
# Older versions of LXML do not support `register_namespace` needed
# for CybOX extensions to work. This is only an issue during RHEL6
# tests, which also use Python 2.6, meaning that unittest.skipTest
# is not implemented. So we just 'return' here.
return
# self.skipTest("LXML >= 2.3 required to use extensions")

def test_can_load_ciq_extension(self):
from cybox.bindings.extensions.location import ciq_address_3_0
addr = ciq_address_3_0.CIQAddress3_0InstanceType()

Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ deps = -rrequirements.txt
[testenv:rhel6]
basepython=python2.6
commands =
nosetests cybox
nosetests cybox --exclude=ciq_test.py
deps =
lxml==2.2.3
mixbox>=0.0.7
Expand Down

0 comments on commit 370e540

Please sign in to comment.