Skip to content

Commit 3448500

Browse files
committed
Split edit ok and edit not ok test into two tests.
Having them combined seems to cause them to fail in CI. Will splitting them with separate setup for each work better?
1 parent 6d0e531 commit 3448500

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

test/test_liveserver.py

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -923,38 +923,38 @@ def test_login_fail_then_succeed(self):
923923
# look for change in text in sidebar post login
924924
self.assertIn('<b>Hello, admin</b>', f.text)
925925

926-
def test__generic_item_template(self):
926+
def test__generic_item_template_editok(self, user="admin"):
927927
"""Load /status1 object. Admin has edit rights so should see
928928
a submit button. fred doesn't have edit rights
929929
so should not have a submit button.
930930
"""
931-
for user in ["admin", "fred"]:
932-
# Set up session to manage cookies <insert blue monster here>
933-
session = requests.Session()
934-
session.headers.update({'Origin': self.url_base()})
935-
936-
# login using form
937-
login = {"__login_name": user, '__login_password': 'sekrit',
938-
"@action": "login"}
939-
f = session.post(self.url_base()+'/', data=login)
940-
# look for change in text in sidebar post login
941-
self.assertIn('Hello, %s'%user, f.text)
942-
f = session.post(self.url_base()+'/status7', data=login)
943-
print(f.content)
944-
945-
# status1's name is unread
946-
self.assertIn(b'done-cbb', f.content)
947-
948-
if user == 'admin':
949-
self.assertIn(b'<input name="submit_button" type="submit" value="Submit Changes">', f.content)
950-
else:
951-
self.assertNotIn(b'<input name="submit_button" type="submit" value="Submit Changes">', f.content)
931+
# Set up session to manage cookies <insert blue monster here>
932+
session = requests.Session()
933+
session.headers.update({'Origin': self.url_base()})
934+
935+
# login using form
936+
login = {"__login_name": user, '__login_password': 'sekrit',
937+
"@action": "login"}
938+
f = session.post(self.url_base()+'/', data=login)
939+
# look for change in text in sidebar post login
940+
self.assertIn('Hello, %s'%user, f.text)
941+
f = session.post(self.url_base()+'/status7', data=login)
942+
print(f.content)
943+
944+
# status1's name is unread
945+
self.assertIn(b'done-cbb', f.content)
946+
947+
if user == 'admin':
948+
self.assertIn(b'<input name="submit_button" type="submit" value="Submit Changes">', f.content)
949+
else:
950+
self.assertNotIn(b'<input name="submit_button" type="submit" value="Submit Changes">', f.content)
952951

953-
# try explicit logout to see if there is some carryover
954-
# between sessions
955-
f = session.get(self.url_base()+'/?@action=logout')
956-
self.assertIn(b"Remember me?", f.content)
952+
# logout
953+
f = session.get(self.url_base()+'/?@action=logout')
954+
self.assertIn(b"Remember me?", f.content)
957955

956+
def test__generic_item_template_editbad(self, user="fred"):
957+
self.test__generic_item_template_editok(user=user)
958958

959959
def test_new_issue_with_file_upload(self):
960960
# Set up session to manage cookies <insert blue monster here>

0 commit comments

Comments
 (0)