Skip to content

Commit

Permalink
[GH-76] Remove cobertura and lxml dependency
Browse files Browse the repository at this point in the history
- Remove cobertura-clover-transform from test-requirements.
- Remove lxml dependency from VNX file UT.
  • Loading branch information
Murray-LIANG committed Dec 20, 2016
1 parent d02b29d commit 53232d1
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 15 deletions.
6 changes: 3 additions & 3 deletions storops/vnx/xmlapi.py
Expand Up @@ -53,21 +53,21 @@ def list_elements(self, name, elements):

_xb = XmlBuilder()
_default_task_timeout = 5 * 60
xml_ns = 'http://www.emc.com/schemas/celerra/xml_api'
XML_NS = 'http://www.emc.com/schemas/celerra/xml_api'


class NasXmlBuilder(object):

@staticmethod
def query_package(body):
return _xb.RequestPacket(_xb.Request(_xb.Query(body)),
xmlns=xml_ns)
xmlns=XML_NS)

@staticmethod
def task_package(body):
return _xb.RequestPacket(
_xb.Request(_xb.StartTask(body, timeout=_default_task_timeout)),
xmlns=xml_ns)
xmlns=XML_NS)

@classmethod
def get_filesystem(cls, name=None, fs_id=None):
Expand Down
3 changes: 1 addition & 2 deletions test-requirements.txt
Expand Up @@ -7,6 +7,5 @@ pytest-cov>=2.1.0
pytest-xdist>=1.13.1
pytest-capturelog>=0.7
xmltodict>=0.9.2
cobertura-clover-transform>=1.1.4
fasteners>=0.12.0
ddt>=1.0.1 # MIT
ddt>=1.0.1 # MIT
14 changes: 9 additions & 5 deletions test/vnx/nas_mock.py
Expand Up @@ -21,11 +21,12 @@

import six
import xmltodict as xmltodict
from lxml import etree
import xml.etree.ElementTree as ET
from mock import patch

from storops.lib.common import cache, allow_omit_parentheses
from storops.vnx.nas_client import VNXNasClient
from storops.vnx.xmlapi import XML_NS
from test.utils import ConnectorMock, read_test_file
from test.vnx.cli_mock import MockCli

Expand All @@ -34,6 +35,9 @@
log = logging.getLogger(__name__)


ET.register_namespace('', XML_NS)


@cache
def t_nas():
""" get the test NAS client
Expand All @@ -52,7 +56,7 @@ def get_folder(cls, body):

ret = [cls.base_folder]
# get two levels after Request
node = etree.fromstring(body.encode('utf-8'))
node = ET.fromstring(body.encode('utf-8'))
while len(ret) < 3:
tag = cls.delete_ns(node.tag)
if tag in skipped_nodes:
Expand Down Expand Up @@ -82,7 +86,7 @@ def read_index(folder):
@classmethod
def get_filename(cls, body):
xml_string = cls.read_index(cls.get_folder(body))
indices = etree.fromstring(xml_string.encode('utf-8'))
indices = ET.fromstring(xml_string.encode('utf-8'))
ret = None
for index in indices:
for request_packet in index:
Expand Down Expand Up @@ -210,9 +214,9 @@ def xml_compare(a, b):
:param b: xml to compare
"""
if not isinstance(a, six.string_types):
a = etree.tostring(a)
a = ET.tostring(a, encoding='utf-8').decode('utf-8')
if not isinstance(b, six.string_types):
b = etree.tostring(b)
b = ET.tostring(b, encoding='utf-8').decode('utf-8')
a = normalise_dict(xmltodict.parse(a))
b = normalise_dict(xmltodict.parse(b))
return a == b
5 changes: 0 additions & 5 deletions tox.ini
Expand Up @@ -9,7 +9,6 @@ deps =

commands =
py.test {posargs} -n2 --cov=storops --cov-config coverage.ini --cov-report=xml --cov-report term --junit-xml=junit-result.xml test
cobertura-clover-transform coverage.xml -o clover.xml

setenv =
STATICBUILD = true
Expand All @@ -30,25 +29,21 @@ commands =
# all component tests
commands =
py.test -n2 --cov=storops --cov-config coverage.ini --cov-report=xml --cov-report term --junit-xml=junit-result.xml comptest
cobertura-clover-transform coverage.xml -o clover.xml


[testenv:vnx]
# component test for vnx platform
commands =
py.test -n2 --cov=storops --cov-config coverage.ini --cov-report=xml --cov-report term --junit-xml=junit-result.xml comptest/vnx
cobertura-clover-transform coverage.xml -o clover.xml


[testenv:unity]
# component test for unity platform
commands =
py.test -n2 --cov=storops --cov-config coverage.ini --cov-report=xml --cov-report term --junit-xml=junit-result.xml comptest/unity
cobertura-clover-transform coverage.xml -o clover.xml


[testenv:vnx_multi]
# component for VNX features that requires more than 1 array
commands =
py.test --cov=storops --cov-config coverage.ini --cov-report=xml --cov-report term --junit-xml=junit-result.xml comptest/vnx/test_mirror_view.py
cobertura-clover-transform coverage.xml -o clover.xml

0 comments on commit 53232d1

Please sign in to comment.