git://git.onelab.eu
/
tests.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
14ee281
)
fix errors
author
Tony Mack
<tmack@cs.princeton.edu>
Tue, 19 Feb 2008 00:08:49 +0000
(
00:08
+0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Tue, 19 Feb 2008 00:08:49 +0000
(
00:08
+0000)
qaapi/qa/tests/api_unit_test.py
patch
|
blob
|
history
diff --git
a/qaapi/qa/tests/api_unit_test.py
b/qaapi/qa/tests/api_unit_test.py
index
6fd36bd
..
f098991
100755
(executable)
--- a/
qaapi/qa/tests/api_unit_test.py
+++ b/
qaapi/qa/tests/api_unit_test.py
@@
-243,7
+243,7
@@
def random_attribute_type():
return {
'name': randstr(100),
'description': randstr(254),
return {
'name': randstr(100),
'description': randstr(254),
- 'min_role_id': random.sample(roles
.values()
, 1)[0],
+ 'min_role_id': random.sample(roles, 1)[0],
}
def random_pcu_type():
}
def random_pcu_type():
@@
-1059,7
+1059,7
@@
class api_unit_test(Test):
attribute_type = attribute_types[0]
self.isequal(attribute_type, attribute_type_fields, 'UpdateSliceAttributeType - isequal')
attribute_type = attribute_types[0]
self.isequal(attribute_type, attribute_type_fields, 'UpdateSliceAttributeType - isequal')
- attribute_types = GetSliceAttributeType(auth, attribute_type_ids)
+ attribute_types = GetSliceAttributeType
s
(auth, attribute_type_ids)
if attribute_types is not None:
at_ids = [at['attribute_type_id'] for at in attribute_types]
self.islistequal(attribute_type_ids, at_ids, 'GetSliceAttributeTypes - isequal')
if attribute_types is not None:
at_ids = [at['attribute_type_id'] for at in attribute_types]
self.islistequal(attribute_type_ids, at_ids, 'GetSliceAttributeTypes - isequal')
@@
-1088,26
+1088,25
@@
class api_unit_test(Test):
def SliceInstantiations(self, n = 2):
insts = []
AddSliceInstantiation= self.debug(api.AddSliceInstantiation)
def SliceInstantiations(self, n = 2):
insts = []
AddSliceInstantiation= self.debug(api.AddSliceInstantiation)
- GetSliceInstantiations = self.debug(api.GetSliceInstantiat
on
)
+ GetSliceInstantiations = self.debug(api.GetSliceInstantiat
ions
)
for i in range(n):
for i in range(n):
- inst
antiation_fields = random_instantiation(
)
- result = AddSliceInstantiation(auth, inst
antiation_fields
)
+ inst
= randstr(10
)
+ result = AddSliceInstantiation(auth, inst)
if result is None: continue
if result is None: continue
- instantiation = instantiation_fields['instantiation']
- insts.append(instantiation)
+ insts.append(inst)
# Check slice instantiaton
# Check slice instantiaton
- instantiations = GetSliceInstantiation
(auth, ['instantiation']
)
+ instantiations = GetSliceInstantiation
s(auth
)
if instantiations is None: continue
if instantiations is None: continue
+ instantiations = filter(lambda x: x in [inst], instantiations)
instantiation = instantiations[0]
instantiation = instantiations[0]
- self.isequal(instantiation, inst
antiation_fields
, 'AddSliceInstantiation - isequal')
+ self.isequal(instantiation, inst, 'AddSliceInstantiation - isequal')
instantiations = GetSliceInstantiations(auth, insts)
if instantiations is not None:
instantiations = GetSliceInstantiations(auth, insts)
if instantiations is not None:
- inst_list = [i['instantiaion'] for i in instantiations]
- self.islistequal(insts, inst_list, 'GetSliceInstantiations - isequal')
+ self.islistequal(insts, instantiations, 'GetSliceInstantiations - isequal')
if self.config.verbose:
utils.header("Added slice instantiations: %s" % insts)
if self.config.verbose:
utils.header("Added slice instantiations: %s" % insts)
@@
-1122,7
+1121,8
@@
class api_unit_test(Test):
result = DeleteSliceInstantiation(auth, instantiation)
# Check
result = DeleteSliceInstantiation(auth, instantiation)
# Check
- instantiations = GetSliceInstnatiations(auth, self.slice_instantiations)
+ instantiations = GetSliceInstantiations(auth)
+ instantiations = filter(lambda x: x in self.slice_instantiations, instantiations)
self.islistequal(instantiations, [], 'DeleteSliceInstantiation - check')
if self.config.verbose:
utils.header("Deleted slice instantiations" % self.slice_instantiations)
self.islistequal(instantiations, [], 'DeleteSliceInstantiation - check')
if self.config.verbose:
utils.header("Deleted slice instantiations" % self.slice_instantiations)
@@
-1134,7
+1134,7
@@
class api_unit_test(Test):
AddSlice = self.debug(api.AddSlice)
GetSlices = self.debug(api.GetSlices)
UpdateSlice = self.debug(api.UpdateSlice)
AddSlice = self.debug(api.AddSlice)
GetSlices = self.debug(api.GetSlices)
UpdateSlice = self.debug(api.UpdateSlice)
- AddSliceToNode = self.debug(api.AddSliceToNode)
+ AddSliceToNode = self.debug(api.AddSliceToNode
s
)
for i in range(n):
# Add Site
slice_fields = random_slice()
for i in range(n):
# Add Site
slice_fields = random_slice()