From 464541903df276f2fcbd41761dcf3d40cfe7c2e8 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 10 Dec 2021 01:24:04 +0100
Subject: [PATCH] TST: fix tests
---
tests/test_permissions.py | 1 -
tests/test_server_side_scripting.py | 12 ++++++++----
tests/test_state.py | 4 +++-
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/tests/test_permissions.py b/tests/test_permissions.py
index 3fb41c6..182c4fd 100644
--- a/tests/test_permissions.py
+++ b/tests/test_permissions.py
@@ -1110,7 +1110,6 @@ def test_use_as_parent():
datatype=db.TEXT).add_parent(
name="TestProperty")
- deny_permission(p, "USE:AS_PARENT")
'''Failure'''
deny_permission(p, "USE:AS_PARENT")
with raises(db.TransactionError) as cm:
diff --git a/tests/test_server_side_scripting.py b/tests/test_server_side_scripting.py
index 1c03252..6e8a86a 100644
--- a/tests/test_server_side_scripting.py
+++ b/tests/test_server_side_scripting.py
@@ -227,7 +227,8 @@ def test_diagnostics_basic():
print(etree.tostring(xml))
assert response.status == 200 # ok
- assert response.getheader("Content-Type") == 'text/xml; charset=UTF-8'
+ assert "text/xml" in response.getheader("Content-Type").lower()
+ assert "charset=utf-8" in response.getheader("Content-Type").lower()
diagnostics = xml.xpath("/Response/script/stdout")[0].text
assert diagnostics is not None
@@ -266,7 +267,8 @@ def test_diagnostics_with_file_upload():
response = get_connection().insert(
["scripting"], body=body, headers=headers)
assert response.status == 200 # ok
- assert response.getheader("Content-Type") == 'text/xml; charset=UTF-8'
+ assert "text/xml" in response.getheader("Content-Type").lower()
+ assert "charset=utf-8" in response.getheader("Content-Type").lower()
xml = etree.parse(response)
print(etree.tostring(xml))
@@ -316,7 +318,8 @@ def test_call_as_anonymous_with_administration_role():
xml = etree.parse(response)
assert response.getheader("Set-Cookie") is None # no auth token returned
- assert response.getheader("Content-Type") == 'text/xml; charset=UTF-8'
+ assert "text/xml" in response.getheader("Content-Type").lower()
+ assert "charset=utf-8" in response.getheader("Content-Type").lower()
assert response.status == 200 # ok
assert xml.xpath("/Response/script/@code")[0] == "0"
@@ -390,7 +393,8 @@ def test_anonymous_script_calling_success():
body=urlencode(form))
assert response.status == 200 # ok
assert response.getheader("Set-Cookie") is None # no auth token returned
- assert response.getheader("Content-Type") == 'text/xml; charset=UTF-8'
+ assert "text/xml" in response.getheader("Content-Type").lower()
+ assert "charset=utf-8" in response.getheader("Content-Type").lower()
body = response.read()
xml = etree.fromstring(body)
diff --git a/tests/test_state.py b/tests/test_state.py
index 1bc8a49..e376dd0 100644
--- a/tests/test_state.py
+++ b/tests/test_state.py
@@ -49,6 +49,8 @@ def setup_users():
"Grant", "STATE:TRANSITION:Transition4"),
db.administration.PermissionRule(
"Grant", "STATE:TRANSITION:EditTransition"),
+ db.administration.PermissionRule(
+ "Grant", "STATE:TRANSITION:StartReviewTransition"),
])
db.administration._set_permissions(
role="team-leader", permission_rules=[
@@ -624,11 +626,11 @@ def test_full_edit_review_publish_cycle():
rec.update()
# start review
- switch_to_test_user("team-leader")
rec.state = db.State(model="EditReviewPublish", name="ReviewState")
rec.update()
# as team-leader
+ switch_to_test_user("team-leader")
rec.get_property("TestProperty").value = next(val)
rec.update()
--
GitLab