diff options
| -rw-r--r-- | keystone-moon/keystone/contrib/moon/backends/sql.py | 2 | ||||
| -rw-r--r-- | moonclient/moonclient/tests.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/keystone-moon/keystone/contrib/moon/backends/sql.py b/keystone-moon/keystone/contrib/moon/backends/sql.py index 43bd3078..0a2e2407 100644 --- a/keystone-moon/keystone/contrib/moon/backends/sql.py +++ b/keystone-moon/keystone/contrib/moon/backends/sql.py @@ -812,7 +812,7 @@ class IntraExtensionConnector(IntraExtensionDriver): if attr != 'id': setattr(ref, attr, getattr(new_ref, attr)) session.flush() - return self.get_subject_assignment_list(intra_extension_id, subject_id, subject_category_id) + return subject_assignment_list def add_subject_assignment_list(self, intra_extension_id, subject_id, subject_category_id, subject_scope_id): new_subject_assignment_list = self.get_subject_assignment_list(intra_extension_id, subject_id, subject_category_id) diff --git a/moonclient/moonclient/tests.py b/moonclient/moonclient/tests.py index 63f1ed14..1e1020bf 100644 --- a/moonclient/moonclient/tests.py +++ b/moonclient/moonclient/tests.py @@ -33,7 +33,7 @@ class TestsLaunch(Lister): def __replace_var_in_str(self, data_str): for exp in re.findall("\$\w+", data_str): if exp.replace("$", "") in self.result_vars: - data_str = data_str.replace(exp, self.result_vars[exp.replace("$", "")]) + data_str = re.sub(exp.replace("$", "\$") + "(?=$|\s)", self.result_vars[exp.replace("$", "")], data_str) return data_str def __compare_results(self, expected, observed): |