Skip to content

Commit 4fed564

Browse files
author
Deli Zhang
committed
fix travis issue
Signed-off-by: Deli Zhang <[email protected]>
1 parent 5c67f16 commit 4fed564

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
language: python
22
python:
3-
- "2.6"
3+
- "2.7"
44
# command to install dependencies
55
install:
6-
- "pip install -r requirements.txt --use-mirrors"
6+
- "pip install -r requirements.txt"
77
# command to run tests
88
script:
99
- "pylint --version"

src/XenCert/StorageHandler.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3155,7 +3155,7 @@ def FunctionalTests(self):
31553155
StorageHandlerUtil.DestroySR(self.session, sr_ref)
31563156
checkPoints += 1
31573157
except Exception, e:
3158-
Print(" - Failed to cleanup after CIFS functional tests, please delete the following manually: %s, %s, %s. Exception: %s" % (testfile, testdir, mountpoint, str(e)))
3158+
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)))
31593159

31603160
return (retVal, checkPoints, totalCheckPoints)
31613161

@@ -3464,5 +3464,6 @@ def GetStorageHandler(g_storage_conf):
34643464
return StorageHandlerCIFS(g_storage_conf)
34653465

34663466
if g_storage_conf["storage_type"] == "isl":
3467-
return StorageHandlerISL(g_storage_conf)
3467+
#return StorageHandlerISL(g_storage_conf)
3468+
pass
34683469
return None

tests/pylintrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ zope=no
122122
# so shouldn't trigger E0201 when accessed (need zope=yes to be considered).
123123
acquired-members=REQUEST,acl_users,aq_parent
124124

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

126128
# checks for
127129
# * unused variables / imports

0 commit comments

Comments
 (0)