Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add OSA adapter for XCI"
[releng.git]
/
utils
/
test
/
testapi
/
opnfv_testapi
/
tests
/
unit
/
fake_pymongo.py
diff --git
a/utils/test/testapi/opnfv_testapi/tests/unit/fake_pymongo.py
b/utils/test/testapi/opnfv_testapi/tests/unit/fake_pymongo.py
index
adaf6f7
..
3320a86
100644
(file)
--- a/
utils/test/testapi/opnfv_testapi/tests/unit/fake_pymongo.py
+++ b/
utils/test/testapi/opnfv_testapi/tests/unit/fake_pymongo.py
@@
-6,9
+6,12
@@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
+import re
+
+from operator import itemgetter
+
from bson.objectid import ObjectId
from concurrent.futures import ThreadPoolExecutor
from bson.objectid import ObjectId
from concurrent.futures import ThreadPoolExecutor
-from operator import itemgetter
def thread_execute(method, *args, **kwargs):
def thread_execute(method, *args, **kwargs):
@@
-119,10
+122,14
@@
class MemDb(object):
@staticmethod
def _compare_date(spec, value):
@staticmethod
def _compare_date(spec, value):
+ gte = True
+ lt = False
for k, v in spec.iteritems():
for k, v in spec.iteritems():
- if k == '$gte' and value >= v:
- return True
- return False
+ if k == '$gte' and value < v:
+ gte = False
+ elif k == '$lt' and value < v:
+ lt = True
+ return gte and lt
def _in(self, content, *args):
if self.name == 'scenarios':
def _in(self, content, *args):
if self.name == 'scenarios':
@@
-185,9
+192,13
@@
class MemDb(object):
elif k == 'trust_indicator.current':
if content.get('trust_indicator').get('current') != v:
return False
elif k == 'trust_indicator.current':
if content.get('trust_indicator').get('current') != v:
return False
- elif content.get(k, None) != v:
- return False
-
+ elif not isinstance(v, dict):
+ if isinstance(v, re._pattern_type):
+ if v.match(content.get(k, None)) is None:
+ return False
+ else:
+ if content.get(k, None) != v:
+ return False
return True
def _find(self, *args):
return True
def _find(self, *args):
@@
-195,7
+206,6
@@
class MemDb(object):
for content in self.contents:
if self._in(content, *args):
res.append(content)
for content in self.contents:
if self._in(content, *args):
res.append(content)
-
return res
def find(self, *args):
return res
def find(self, *args):