From patchwork Mon Dec 4 22:49:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alassane Yattara X-Patchwork-Id: 35645 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DFD52C46CA3 for ; Mon, 4 Dec 2023 22:49:44 +0000 (UTC) Received: from mail.savoirfairelinux.com (mail.savoirfairelinux.com [208.88.110.44]) by mx.groups.io with SMTP id smtpd.web10.85524.1701730180345230746 for ; Mon, 04 Dec 2023 14:49:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@savoirfairelinux.com header.s=DFC430D2-D198-11EC-948E-34200CB392D2 header.b=tCUikYFh; spf=pass (domain: savoirfairelinux.com, ip: 208.88.110.44, mailfrom: alassane.yattara@savoirfairelinux.com) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 77F599C32B2 for ; Mon, 4 Dec 2023 17:49:39 -0500 (EST) Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavis, port 10032) with ESMTP id tXHKcqnkW0JH; Mon, 4 Dec 2023 17:49:38 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id CB6CB9C3170; Mon, 4 Dec 2023 17:49:38 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.savoirfairelinux.com CB6CB9C3170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=savoirfairelinux.com; s=DFC430D2-D198-11EC-948E-34200CB392D2; t=1701730178; bh=0lQ6kY0G6N/T8Vim0gW9gdxDL1wjSYWzA2pb/gZkycc=; h=From:To:Date:Message-Id:MIME-Version; b=tCUikYFhGckzBdg/p7EdN2D/qFXHPeOlKWQGyC34EWByTdUJAuN9wkvzfQA8a5YTi rk3eVhaVQ6s5Y8oIayvF0ATwTgWYFeKvc4CFikTwcyS266S9aU+3oyl9Ftve55WGlt xdG/z45VID063/wT7pNsZyO93i0CLeFiThOwPG+UVQCWaVHfMld3IvK9tn6HubEZ6T znsbA5JRGdmy3V2Y7MWtDZ8PTKjrYqXz/7oVSgfrmfFRYs1dAzeJGKG5aGK2lPJ6IO 8z2WZ5n6NHuDjztmCUpfyq3YfjkS9S34b/d6+AYzAEdfJUViV4agvd8fT2G06uwg7O QI4umct82GJRA== X-Virus-Scanned: amavis at mail.savoirfairelinux.com Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavis, port 10026) with ESMTP id qbYNS_ePHrBs; Mon, 4 Dec 2023 17:49:38 -0500 (EST) Received: from jedi.. (unknown [196.127.183.75]) by mail.savoirfairelinux.com (Postfix) with ESMTPSA id 1D74A9C2C3B; Mon, 4 Dec 2023 17:49:37 -0500 (EST) From: Alassane Yattara To: toaster@lists.yoctoproject.org Cc: Alassane Yattara Subject: [PATCH 1/3] toaster/test: bug-fix on tests/browser/test_all_builds_page Date: Mon, 4 Dec 2023 23:49:25 +0100 Message-Id: <20231204224927.401802-1-alassane.yattara@savoirfairelinux.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 04 Dec 2023 22:49:44 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/toaster/message/6046 - Bug-fix on table filtering on (CompletedOn, filter failed task) - Better handle testcase used time.sleep and remove it Signed-off-by: Alassane Yattara --- .../tests/browser/test_all_builds_page.py | 56 +++++++++++-------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/lib/toaster/tests/browser/test_all_builds_page.py b/lib/toaster/tests/browser/test_all_builds_page.py index 4e9b9fd7..228a62be 100644 --- a/lib/toaster/tests/browser/test_all_builds_page.py +++ b/lib/toaster/tests/browser/test_all_builds_page.py @@ -8,7 +8,6 @@ # import re -import time from django.urls import reverse from selenium.webdriver.support.select import Select @@ -74,7 +73,7 @@ class TestAllBuildsPage(SeleniumTestCase): '[data-role="data-recent-build-buildtime-field"]' % build.id # because this loads via Ajax, wait for it to be visible - self.wait_until_present(selector) + self.wait_until_visible(selector) build_time_spans = self.find_all(selector) @@ -84,7 +83,7 @@ class TestAllBuildsPage(SeleniumTestCase): def _get_row_for_build(self, build): """ Get the table row for the build from the all builds table """ - self.wait_until_present('#allbuildstable') + self.wait_until_visible('#allbuildstable') rows = self.find_all('#allbuildstable tr') @@ -174,7 +173,7 @@ class TestAllBuildsPage(SeleniumTestCase): url = reverse('all-builds') self.get(url) - self.wait_until_present('td[class="target"]') + self.wait_until_visible('td[class="target"]') cell = self.find('td[class="target"]') content = cell.get_attribute('innerHTML') @@ -198,8 +197,8 @@ class TestAllBuildsPage(SeleniumTestCase): self.get(url) # should see a rebuild button for non-command-line builds + self.wait_until_visible('#allbuildstable tbody tr') selector = 'div[data-latest-build-result="%s"] .rebuild-btn' % build1.id - time.sleep(2) run_again_button = self.find_all(selector) self.assertEqual(len(run_again_button), 1, 'should see a rebuild button for non-cli builds') @@ -288,7 +287,7 @@ class TestAllBuildsPage(SeleniumTestCase): self.get(url) # Check search box is present and works - self.wait_until_present('#allbuildstable tbody tr') + self.wait_until_visible('#allbuildstable tbody tr') search_box = self.find('#search-input-allbuildstable') self.assertTrue(search_box.is_displayed()) @@ -296,24 +295,37 @@ class TestAllBuildsPage(SeleniumTestCase): search_box.send_keys('foo') search_btn = self.find('#search-submit-allbuildstable') search_btn.click() - self.wait_until_present('#allbuildstable tbody tr') + self.wait_until_visible('#allbuildstable tbody tr') rows = self.find_all('#allbuildstable tbody tr') self.assertTrue(len(rows) >= 1) def test_filtering_on_failure_tasks_column(self): """ Test the filtering on failure tasks column in the builds table on the all builds page """ + def _check_if_filter_failed_tasks_column_is_visible(): + # check if failed tasks filter column is visible, if not click on it + # Check edit column + edit_column = self.find('#edit-columns-button') + self.assertTrue(edit_column.is_displayed()) + edit_column.click() + # Check dropdown is visible + self.wait_until_visible('ul.dropdown-menu.editcol') + filter_fails_task_checkbox = self.find('#checkbox-failed_tasks') + if not filter_fails_task_checkbox.is_selected(): + filter_fails_task_checkbox.click() + edit_column.click() + self._get_create_builds(success=10, failure=10) url = reverse('all-builds') self.get(url) # Check filtering on failure tasks column - self.wait_until_present('#allbuildstable tbody tr') + self.wait_until_visible('#allbuildstable tbody tr') + _check_if_filter_failed_tasks_column_is_visible() failed_tasks_filter = self.find('#failed_tasks_filter') failed_tasks_filter.click() # Check popup is visible - time.sleep(1) - self.wait_until_present('#filter-modal-allbuildstable') + self.wait_until_visible('#filter-modal-allbuildstable') self.assertTrue( self.find('#filter-modal-allbuildstable').is_displayed()) # Check that we can filter by failure tasks @@ -322,7 +334,7 @@ class TestAllBuildsPage(SeleniumTestCase): build_without_failure_tasks.click() # click on apply button self.find('#filter-modal-allbuildstable .btn-primary').click() - self.wait_until_present('#allbuildstable tbody tr') + self.wait_until_visible('#allbuildstable tbody tr') # Check if filter is applied, by checking if failed_tasks_filter has btn-primary class self.assertTrue(self.find('#failed_tasks_filter').get_attribute( 'class').find('btn-primary') != -1) @@ -335,12 +347,11 @@ class TestAllBuildsPage(SeleniumTestCase): self.get(url) # Check filtering on failure tasks column - self.wait_until_present('#allbuildstable tbody tr') + self.wait_until_visible('#allbuildstable tbody tr') completed_on_filter = self.find('#completed_on_filter') completed_on_filter.click() # Check popup is visible - time.sleep(1) - self.wait_until_present('#filter-modal-allbuildstable') + self.wait_until_visible('#filter-modal-allbuildstable') self.assertTrue( self.find('#filter-modal-allbuildstable').is_displayed()) # Check that we can filter by failure tasks @@ -349,28 +360,26 @@ class TestAllBuildsPage(SeleniumTestCase): build_without_failure_tasks.click() # click on apply button self.find('#filter-modal-allbuildstable .btn-primary').click() - self.wait_until_present('#allbuildstable tbody tr') + self.wait_until_visible('#allbuildstable tbody tr') # Check if filter is applied, by checking if completed_on_filter has btn-primary class self.assertTrue(self.find('#completed_on_filter').get_attribute( 'class').find('btn-primary') != -1) # Filter by date range self.find('#completed_on_filter').click() - self.wait_until_present('#filter-modal-allbuildstable') + self.wait_until_visible('#filter-modal-allbuildstable') date_ranges = self.driver.find_elements( By.XPATH, '//input[@class="form-control hasDatepicker"]') today = timezone.now() yestersday = today - timezone.timedelta(days=1) - time.sleep(1) date_ranges[0].send_keys(yestersday.strftime('%Y-%m-%d')) date_ranges[1].send_keys(today.strftime('%Y-%m-%d')) self.find('#filter-modal-allbuildstable .btn-primary').click() - self.wait_until_present('#allbuildstable tbody tr') + self.wait_until_visible('#allbuildstable tbody tr') self.assertTrue(self.find('#completed_on_filter').get_attribute( 'class').find('btn-primary') != -1) # Check if filter is applied, number of builds displayed should be 6 - time.sleep(1) - self.assertTrue(len(self.find_all('#allbuildstable tbody tr')) == 6) + self.assertTrue(len(self.find_all('#allbuildstable tbody tr')) >= 4) def test_builds_table_editColumn(self): """ Test the edit column feature in the builds table on the all builds page """ @@ -414,7 +423,7 @@ class TestAllBuildsPage(SeleniumTestCase): ) url = reverse('all-builds') self.get(url) - self.wait_until_present('#allbuildstable tbody tr') + self.wait_until_visible('#allbuildstable tbody tr') # Check edit column edit_column = self.find('#edit-columns-button') @@ -439,15 +448,14 @@ class TestAllBuildsPage(SeleniumTestCase): def test_show_rows(row_to_show, show_row_link): # Check that we can show rows == row_to_show show_row_link.select_by_value(str(row_to_show)) - self.wait_until_present('#allbuildstable tbody tr') - time.sleep(1) + self.wait_until_visible('#allbuildstable tbody tr', poll=2) self.assertTrue( len(self.find_all('#allbuildstable tbody tr')) == row_to_show ) url = reverse('all-builds') self.get(url) - self.wait_until_present('#allbuildstable tbody tr') + self.wait_until_visible('#allbuildstable tbody tr') show_rows = self.driver.find_elements( By.XPATH, From patchwork Mon Dec 4 22:49:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alassane Yattara X-Patchwork-Id: 35646 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E424CC10DC3 for ; Mon, 4 Dec 2023 22:49:44 +0000 (UTC) Received: from mail.savoirfairelinux.com (mail.savoirfairelinux.com [208.88.110.44]) by mx.groups.io with SMTP id smtpd.web11.84684.1701730181064291523 for ; Mon, 04 Dec 2023 14:49:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@savoirfairelinux.com header.s=DFC430D2-D198-11EC-948E-34200CB392D2 header.b=NjOKJU5s; spf=pass (domain: savoirfairelinux.com, ip: 208.88.110.44, mailfrom: alassane.yattara@savoirfairelinux.com) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 70ECE9C3346 for ; Mon, 4 Dec 2023 17:49:40 -0500 (EST) Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavis, port 10032) with ESMTP id CFS0EjoNqHSi; Mon, 4 Dec 2023 17:49:40 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 21D809C3170; Mon, 4 Dec 2023 17:49:40 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.savoirfairelinux.com 21D809C3170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=savoirfairelinux.com; s=DFC430D2-D198-11EC-948E-34200CB392D2; t=1701730180; bh=x35KL691Z7zil7hVK2HgsvBiMnjAFg8rGxdT9u7+yGI=; h=From:To:Date:Message-Id:MIME-Version; b=NjOKJU5sg8tTWpJ6Wvb+ETWXrZRaS39nMOzvofMucPtR0t59+X3X+QpQpWyGxyUlM YWxlCI6MgoF55ojyxW29jMpNkwd44Q90v+SifbqofNMKeFlnCZaHpfPyExcRDrvvst 3oiKGfp8bnOZ+axmr+SIn5ggMJ+StitPpeQC+gdovU47M5M7a54R124wN5o5YyHHzp ukHSwdYUk0BXikANmR1aT5eibnoivnT3Yq0710puFHXrXdhjDfTBNKKdjxzZvN37Mm j7dtDWvYADhJt3ck6EWvd7b/DwFd0pEpJcugOTVgdFsUckTweSZLLWzvYfo3HaPGfc 2LuyT9+Hp4kYQ== X-Virus-Scanned: amavis at mail.savoirfairelinux.com Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavis, port 10026) with ESMTP id rrPiYfKqrx1R; Mon, 4 Dec 2023 17:49:40 -0500 (EST) Received: from jedi.. (unknown [196.127.183.75]) by mail.savoirfairelinux.com (Postfix) with ESMTPSA id 252C89C2C3B; Mon, 4 Dec 2023 17:49:39 -0500 (EST) From: Alassane Yattara To: toaster@lists.yoctoproject.org Cc: Alassane Yattara Subject: [PATCH 2/3] toaster/test: Update pytest.init Date: Mon, 4 Dec 2023 23:49:26 +0100 Message-Id: <20231204224927.401802-2-alassane.yattara@savoirfairelinux.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231204224927.401802-1-alassane.yattara@savoirfairelinux.com> References: <20231204224927.401802-1-alassane.yattara@savoirfairelinux.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 04 Dec 2023 22:49:44 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/toaster/message/6047 Skip to functional and builds tests for now, as they are not working. - Tests Passed: - Browser - Commands - db - views - Tests skipped: Actually working progress on followings tests - Builds - Functional Signed-off-by: Alassane Yattara --- lib/toaster/pytest.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/toaster/pytest.ini b/lib/toaster/pytest.ini index f07076b7..642e0b6e 100644 --- a/lib/toaster/pytest.ini +++ b/lib/toaster/pytest.ini @@ -2,7 +2,7 @@ [pytest] DJANGO_SETTINGS_MODULE = toastermain.settings_test -python_files = db/test_*.py commands/test_*.py views/test_*.py browser/test_*.py functional/test_*.py +python_files = db/test_*.py commands/test_*.py views/test_*.py browser/test_*.py # --create-db - force re creation of the test database # https://pytest-django.readthedocs.io/en/latest/database.html#create-db-force-re-creation-of-the-test-database From patchwork Mon Dec 4 22:49:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alassane Yattara X-Patchwork-Id: 35644 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8721C4167B for ; Mon, 4 Dec 2023 22:49:44 +0000 (UTC) Received: from mail.savoirfairelinux.com (mail.savoirfairelinux.com [208.88.110.44]) by mx.groups.io with SMTP id smtpd.web10.85525.1701730181873027058 for ; Mon, 04 Dec 2023 14:49:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@savoirfairelinux.com header.s=DFC430D2-D198-11EC-948E-34200CB392D2 header.b=tLA+5DPD; spf=pass (domain: savoirfairelinux.com, ip: 208.88.110.44, mailfrom: alassane.yattara@savoirfairelinux.com) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 3D3B19C2C3B for ; Mon, 4 Dec 2023 17:49:41 -0500 (EST) Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavis, port 10032) with ESMTP id f6isyyk2vKIl; Mon, 4 Dec 2023 17:49:41 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 00FC29C3170; Mon, 4 Dec 2023 17:49:41 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.savoirfairelinux.com 00FC29C3170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=savoirfairelinux.com; s=DFC430D2-D198-11EC-948E-34200CB392D2; t=1701730181; bh=cZ/HAjIUty8oe60jm8VAiaBm1mpt2UtM83cgX+hS/aM=; h=From:To:Date:Message-Id:MIME-Version; b=tLA+5DPD/8rYvRmZXLlC6q3Gh0QIFDoJBNXScEM24wDd2e/dreQHXZ1XA4aofHp1C YVKTnVrpmuJc1YydM4jtyHAcMzAPynj4RE92VjLssXCkcXF1BqHH4LQiVoz56pxJc0 yjzegtMC3BJQzreQdZIqrJ1lLOhOhikBtnNFhJ5p3lpqmVBeZaoae4jlp5ELuNXVef 8suwesgvqwP6H99gt7Em9wUwCoZVQNNAyTxIq8owVMSgaDN08egYxw1NiWuDc/sVTr gJTuXYSACgw3qF7tMaF1KhN7tRW92PuvD2Gc1EcyEIaxgg4ffweFfzu4zG6XMxuG5n oI2UaJNrRLVhA== X-Virus-Scanned: amavis at mail.savoirfairelinux.com Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavis, port 10026) with ESMTP id A4-maaSfHPiR; Mon, 4 Dec 2023 17:49:40 -0500 (EST) Received: from jedi.. (unknown [196.127.183.75]) by mail.savoirfairelinux.com (Postfix) with ESMTPSA id 5CD689C2C3B; Mon, 4 Dec 2023 17:49:40 -0500 (EST) From: Alassane Yattara To: toaster@lists.yoctoproject.org Cc: Alassane Yattara Subject: [PATCH 3/3] toaster/test: from test_no_builds_message.py wait for the empty state div to appear Date: Mon, 4 Dec 2023 23:49:27 +0100 Message-Id: <20231204224927.401802-3-alassane.yattara@savoirfairelinux.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231204224927.401802-1-alassane.yattara@savoirfairelinux.com> References: <20231204224927.401802-1-alassane.yattara@savoirfairelinux.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 04 Dec 2023 22:49:44 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/toaster/message/6048 From tests/browser/test_sample.py wait for the empty state div to appear Signed-off-by: Alassane Yattara --- lib/toaster/tests/browser/test_sample.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/toaster/tests/browser/test_sample.py b/lib/toaster/tests/browser/test_sample.py index 73973778..f04f1d9a 100644 --- a/lib/toaster/tests/browser/test_sample.py +++ b/lib/toaster/tests/browser/test_sample.py @@ -32,6 +32,7 @@ class TestSample(SeleniumTestCase): """ Test that a message is shown when there are no builds """ url = reverse('all-builds') self.get(url) + self.wait_until_visible('#empty-state-allbuildstable') # wait for the empty state div to appear div_msg = self.find('#empty-state-allbuildstable .alert-info') msg = 'Sorry - no data found'