From 39b262d3dbbc124c526364169def133855fcc34e Mon Sep 17 00:00:00 2001 From: Jennifer Richards Date: Thu, 11 May 2023 17:07:37 -0300 Subject: [PATCH 1/2] test: Remove ScheduleEditTests.testUnschedule Has been disabled under Django 2. Simple refactoring does not make it functional under Django 3. Probably because we know that Selenium does not handle HTML5 drag-and-drop well. Discarding until we move to a better JS testing framework. --- ietf/meeting/tests_js.py | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/ietf/meeting/tests_js.py b/ietf/meeting/tests_js.py index 327d526cc8e..06377cd7e9e 100644 --- a/ietf/meeting/tests_js.py +++ b/ietf/meeting/tests_js.py @@ -880,42 +880,6 @@ def test_session_constraint_hints(self): self.assertNotIn('would-violate-hint', session_elements[4].get_attribute('class'), 'Constraint violation should not be indicated on non-conflicting session') -@ifSeleniumEnabled -@skipIf(django.VERSION[0]==2, "Skipping test with race conditions under Django 2") -class ScheduleEditTests(IetfSeleniumTestCase): - def testUnschedule(self): - - meeting = make_meeting_test_data() - - self.assertEqual(SchedTimeSessAssignment.objects.filter(session__meeting=meeting, session__group__acronym='mars', schedule__name='test-schedule').count(),1) - - - ss = list(SchedTimeSessAssignment.objects.filter(session__meeting__number=72,session__group__acronym='mars',schedule__name='test-schedule')) # pyflakes:ignore - - self.login() - url = self.absreverse('ietf.meeting.views.edit_meeting_schedule',kwargs=dict(num='72',name='test-schedule',owner='plain@example.com')) - self.driver.get(url) - - # driver.get() will wait for scripts to finish, but not ajax - # requests. Wait for completion of the permissions check: - read_only_note = self.driver.find_element(By.ID, 'read_only') - WebDriverWait(self.driver, 10).until(expected_conditions.invisibility_of_element(read_only_note), "Read-only schedule") - - s1 = Session.objects.filter(group__acronym='mars', meeting=meeting).first() - selector = "#session_{}".format(s1.pk) - WebDriverWait(self.driver, 30).until(expected_conditions.presence_of_element_located((By.CSS_SELECTOR, selector)), "Did not find %s"%selector) - - self.assertEqual(self.driver.find_elements(By.CSS_SELECTOR, "#sortable-list #session_{}".format(s1.pk)), []) - - element = self.driver.find_element(By.ID, 'session_{}'.format(s1.pk)) - target = self.driver.find_element(By.ID, 'sortable-list') - ActionChains(self.driver).drag_and_drop(element,target).perform() - - self.assertTrue(self.driver.find_elements(By.CSS_SELECTOR, "#sortable-list #session_{}".format(s1.pk))) - - time.sleep(0.1) # The API that modifies the database runs async - - self.assertEqual(SchedTimeSessAssignment.objects.filter(session__meeting__number=72,session__group__acronym='mars',schedule__name='test-schedule').count(),0) @ifSeleniumEnabled class SlideReorderTests(IetfSeleniumTestCase): From 0e4de6d2e91871d9fef00a7f6f1206f9f0ff1c78 Mon Sep 17 00:00:00 2001 From: Jennifer Richards Date: Fri, 12 May 2023 10:55:45 -0300 Subject: [PATCH 2/2] test: Remove unused imports --- ietf/meeting/tests_js.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/ietf/meeting/tests_js.py b/ietf/meeting/tests_js.py index 06377cd7e9e..2e7a5de6c67 100644 --- a/ietf/meeting/tests_js.py +++ b/ietf/meeting/tests_js.py @@ -7,9 +7,7 @@ import shutil import os import re -from unittest import skipIf -import django from django.utils import timezone from django.utils.text import slugify from django.db.models import F