sync test-requirement.txt to nova

make some changes according to the update

sync test-requirement.txt to nova's test-requirement.txt

Change-Id: Ifa35af8ee7fd63cfdbc27f947de9b5d8bf40abc3
This commit is contained in:
jichenjc 2015-10-15 03:56:58 +08:00
parent 8c84bc05da
commit 1af84408a5
4 changed files with 11 additions and 11 deletions

View File

@ -1047,7 +1047,7 @@ class ZVMDriverTestCases(ZVMTestCase):
'fakeimagename', '/tmp').AndReturn('/tmp/fakeimg') 'fakeimagename', '/tmp').AndReturn('/tmp/fakeimg')
self.mox.ReplayAll() self.mox.ReplayAll()
class FakeInstanceType: class FakeInstanceType(object):
def __init__(self): def __init__(self):
self.root_gb = 10 self.root_gb = 10
self.ephemeral_gb = 10 self.ephemeral_gb = 10
@ -1092,7 +1092,7 @@ class ZVMDriverTestCases(ZVMTestCase):
inst = fake_instance.fake_instance_obj(self.context) inst = fake_instance.fake_instance_obj(self.context)
class FakeInstanceType: class FakeInstanceType(object):
def __init__(self): def __init__(self):
self.root_gb = -1 self.root_gb = -1
self.ephemeral_gb = 10 self.ephemeral_gb = 10

View File

@ -333,7 +333,7 @@ class sles12(sles):
return "echo 'root:%s' | chpasswd" % admin_password return "echo 'root:%s' | chpasswd" % admin_password
class ListDistManager(): class ListDistManager(object):
def get_linux_dist(self, os_version): def get_linux_dist(self, os_version):
distro, release = self._parse_dist(os_version) distro, release = self._parse_dist(os_version)
return globals()[distro + release] return globals()[distro + release]

View File

@ -186,7 +186,7 @@ class XCATUrl(object):
return rurl return rurl
class XCATConnection(): class XCATConnection(object):
"""Https requests to xCAT web service.""" """Https requests to xCAT web service."""
def __init__(self): def __init__(self):

View File

@ -1,13 +1,13 @@
hacking>=0.9.2,<0.10 hacking<0.11,>=0.10.0
coverage>=3.6 coverage>=3.6
discover discover
fixtures>=0.3.14 fixtures>=1.3.1
python-subunit python-subunit>=0.0.18
sphinx>=1.1.2 sphinx>=1.1.2
oslosphinx oslosphinx
oslotest>=1.2.0 oslotest>=1.10.0
testrepository>=0.0.17 testrepository>=0.0.18
testscenarios>=0.4,<0.5 testscenarios>=0.4,<0.5
testtools>=0.9.32 testtools>=1.4.0
mock>=1.0 mock>=1.2
mox>=0.5.3 mox>=0.5.3