Skip to content

Commit

Permalink
fix travis issue
Browse files Browse the repository at this point in the history
Signed-off-by: Deli Zhang <[email protected]>
  • Loading branch information
DeliZhangX committed Nov 7, 2019
1 parent 5c67f16 commit 4fed564
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
language: python
python:
- "2.6"
- "2.7"
# command to install dependencies
install:
- "pip install -r requirements.txt --use-mirrors"
- "pip install -r requirements.txt"
# command to run tests
script:
- "pylint --version"
Expand Down
5 changes: 3 additions & 2 deletions src/XenCert/StorageHandler.py
Original file line number Diff line number Diff line change
Expand Up @@ -3155,7 +3155,7 @@ def FunctionalTests(self):
StorageHandlerUtil.DestroySR(self.session, sr_ref)
checkPoints += 1
except Exception, e:
Print(" - Failed to cleanup after CIFS functional tests, please delete the following manually: %s, %s, %s. Exception: %s" % (testfile, testdir, mountpoint, str(e)))
Print(" - Failed to cleanup after CIFS functional tests, please delete the following manually: %s, %s, %s(sr). Exception: %s" % (testfile, testdir, self.session.xenapi.SR.get_uuid(sr_ref), str(e)))

return (retVal, checkPoints, totalCheckPoints)

Expand Down Expand Up @@ -3464,5 +3464,6 @@ def GetStorageHandler(g_storage_conf):
return StorageHandlerCIFS(g_storage_conf)

if g_storage_conf["storage_type"] == "isl":
return StorageHandlerISL(g_storage_conf)
#return StorageHandlerISL(g_storage_conf)
pass
return None
2 changes: 2 additions & 0 deletions tests/pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ zope=no
# so shouldn't trigger E0201 when accessed (need zope=yes to be considered).
acquired-members=REQUEST,acl_users,aq_parent

ignored-modules=scsiutil,iscsilib,util,BaseISCSI,nfs,lvhdutil,lvutil,srmetadata,metadata,vhdutil,mpath_cli,mpath_dmp,xs_errors


# checks for
# * unused variables / imports
Expand Down

0 comments on commit 4fed564

Please sign in to comment.