tests: Add tests for new functionality

* Add tests for the API and parser changes.
* Add new test mbox files.
* Add new patch series tests.
* Add test to check that dependencies are not shown when disabled.

Signed-off-by: Adam Hassick <[email protected]>
Acked-by: Aaron Conole <[email protected]>
[stephenfin: Rename Project field from parse_dependencies to
             show_dependencies. Add some additional tests]
Signed-off-by: Stephen Finucane <[email protected]>

Author: loudonlune

patchwork/tests/api/test_project.py

@@ -35,6 +35,9 @@ def assertSerialized(self, project_obj, project_json):
         self.assertEqual(
             project_obj.subject_match, project_json['subject_match']
         )
+        self.assertEqual(
+            project_obj.show_dependencies, project_json['show_dependencies']
+        )
 
         # nested fields
 
@@ -74,6 +77,18 @@ def test_list_authenticated(self):
         self.assertIn('list_archive_url_format', resp.data[0])
         self.assertIn('commit_url_format', resp.data[0])
 
+    @utils.store_samples('project-list-1.3')
+    def test_list_version_1_3(self):
+        """List projects using API v1.3.
+
+        Validate that newer fields are dropped for older API versions.
+        """
+        create_project()
+        resp = self.client.get(self.api_url(version='1.3'))
+        self.assertEqual(status.HTTP_200_OK, resp.status_code)
+        self.assertEqual(1, len(resp.data))
+        self.assertNotIn('show_dependencies', resp.data[0])
+
     @utils.store_samples('project-list-1.1')
     def test_list_version_1_1(self):
         """List projects using API v1.1.
@@ -141,6 +156,19 @@ def test_detail_by_numeric_linkname(self):
         self.assertEqual(status.HTTP_200_OK, resp.status_code)
         self.assertSerialized(project, resp.data)
 
+    @utils.store_samples('project-detail-1.3')
+    def test_detail_version_1_3(self):
+        """Show project using API v1.3.
+
+        Validate that newer fields are dropped for older API versions.
+        """
+        project = create_project()
+
+        resp = self.client.get(self.api_url(project.pk, version='1.3'))
+        self.assertEqual(status.HTTP_200_OK, resp.status_code)
+        self.assertIn('name', resp.data)
+        self.assertNotIn('show_dependencies', resp.data)
+
     @utils.store_samples('project-detail-1.1')
     def test_detail_version_1_1(self):
         """Show project using API v1.1.

patchwork/tests/api/test_series.py

@@ -44,6 +44,20 @@ def assertSerialized(self, series_obj, series_json):
         self.assertIn(series_obj.get_mbox_url(), series_json['mbox'])
         self.assertIn(series_obj.get_absolute_url(), series_json['web_url'])
 
+        for dep, item in zip(
+            series_obj.dependencies.all(), series_json['dependencies']
+        ):
+            self.assertIn(
+                reverse('api-series-detail', kwargs={'pk': dep.id}), item
+            )
+
+        for dep, item in zip(
+            series_obj.dependents.all(), series_json['dependents']
+        ):
+            self.assertIn(
+                reverse('api-series-detail', kwargs={'pk': dep.id}), item
+            )
+
         # nested fields
 
         self.assertEqual(series_obj.project.id, series_json['project']['id'])
@@ -64,7 +78,9 @@ def test_list_empty(self):
         self.assertEqual(0, len(resp.data))
 
     def _create_series(self):
-        project_obj = create_project(linkname='myproject')
+        project_obj = create_project(
+            linkname='myproject', show_dependencies=True
+        )
         person_obj = create_person(email='[email protected]')
         series_obj = create_series(project=project_obj, submitter=person_obj)
         create_cover(series=series_obj)
@@ -73,7 +89,7 @@ def _create_series(self):
         return series_obj
 
     def test_list_anonymous(self):
-        """List patches as anonymous user."""
+        """List series as anonymous user."""
         series = self._create_series()
 
         resp = self.client.get(self.api_url())
@@ -95,6 +111,35 @@ def test_list_authenticated(self):
         series_rsp = resp.data[0]
         self.assertSerialized(series, series_rsp)
 
+    def test_list_dependencies(self):
+        """Test toggling dependency tracking on and off."""
+        project_obj = create_project(
+            linkname='myproject', show_dependencies=True
+        )
+        person_obj = create_person(email='[email protected]')
+        series_a = create_series(project=project_obj, submitter=person_obj)
+        create_cover(series=series_a)
+        create_patch(series=series_a)
+        series_b = create_series(project=project_obj, submitter=person_obj)
+        create_cover(series=series_b)
+        create_patch(series=series_b)
+        series_a.add_dependencies([series_b])
+
+        resp = self.client.get(self.api_url())
+        self.assertEqual(2, len(resp.data))
+        for series_data in resp.data:
+            self.assertIn('dependents', series_data)
+            self.assertIn('dependencies', series_data)
+
+        project_obj.show_dependencies = False
+        project_obj.save()
+
+        resp = self.client.get(self.api_url())
+        self.assertEqual(2, len(resp.data))
+        for series_data in resp.data:
+            self.assertNotIn('dependents', series_data)
+            self.assertNotIn('dependencies', series_data)
+
     def test_list_filter_project(self):
         """Filter series by project."""
         series = self._create_series()
@@ -125,7 +170,7 @@ def test_list_filter_owner(self):
 
     @utils.store_samples('series-list-1-0')
     def test_list_version_1_0(self):
-        """List patches using API v1.0.
+        """List series using API v1.0.
 
         Validate that newer fields are dropped for older API versions.
         """
@@ -152,7 +197,7 @@ def test_list_bug_335(self):
             create_cover(series=series_obj)
             create_patch(series=series_obj)
 
-        with self.assertNumQueries(6):
+        with self.assertNumQueries(8):
             self.client.get(self.api_url())
 
     @utils.store_samples('series-detail')
@@ -164,9 +209,29 @@ def test_detail(self):
         self.assertEqual(status.HTTP_200_OK, resp.status_code)
         self.assertSerialized(series, resp.data)
 
+    @utils.store_samples('series-detail-1-3')
+    def test_detail_version_1_3(self):
+        """Show series using API v1.3.
+
+        Validate that newer fields are dropped for older API versions.
+        """
+        series = self._create_series()
+
+        resp = self.client.get(self.api_url(series.id, version='1.3'))
+        self.assertIn('url', resp.data)
+        self.assertIn('web_url', resp.data)
+        self.assertIn('web_url', resp.data['cover_letter'])
+        self.assertIn('mbox', resp.data['cover_letter'])
+        self.assertIn('web_url', resp.data['patches'][0])
+        self.assertNotIn('dependents', resp.data)
+        self.assertNotIn('dependencies', resp.data)
+
     @utils.store_samples('series-detail-1-0')
     def test_detail_version_1_0(self):
-        """Show series using API v1.0."""
+        """Show series using API v1.0.
+
+        Validate that newer fields are dropped for older API versions.
+        """
         series = self._create_series()
 
         resp = self.client.get(self.api_url(series.id, version='1.0'))

patchwork/tests/series/dependency-base-patch.mbox

@@ -0,0 +1,102 @@
+From [email protected] Mon Jun 10 21:09:07 2024
+Return-Path: <[email protected]>
+From: Adam Hassick <[email protected]>
+To: [email protected]
+Subject: [PATCH v1 0/2] Add test files for testing
+Date: Mon, 10 Jun 2024 17:09:07 -0400
+Message-ID: <[email protected]>
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+
+Add a test program and a makefile.
+Big surprise here, but this is all for testing.
+
+Adam Hassick (2):
+  Add test program
+  Add a Makefile
+
+ Makefile | 9 +++++++++
+ test.c   | 8 ++++++++
+ 2 files changed, 17 insertions(+)
+ create mode 100644 Makefile
+ create mode 100644 test.c
+
+--
+2.45.2
+
+
+From [email protected] Mon Jun 10 21:09:09 2024
+Return-Path: <[email protected]>
+From: Adam Hassick <[email protected]>
+To: [email protected]
+Subject: [PATCH v1 1/2] Add test program
+Date: Mon, 10 Jun 2024 17:09:09 -0400
+Message-ID: <[email protected]>
+In-Reply-To: <[email protected]>
+References: <[email protected]>
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+
+
+
+Signed-off-by: Adam Hassick <[email protected]>
+---
+ test.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+ create mode 100644 test.c
+
+diff --git a/test.c b/test.c
+new file mode 100644
+index 0000000..5096204
+--- /dev/null
++++ b/test.c
+@@ -0,0 +1,8 @@
++
++#include <stdio.h>
++
++int main() {
++	printf("HELLOOOOO!!!! Hi there!");
++	return 0;
++}
++
+--
+2.45.2
+
+
+From [email protected] Mon Jun 10 21:09:11 2024
+Return-Path: <[email protected]>
+From: Adam Hassick <[email protected]>
+To: [email protected]
+Subject: [PATCH v1 2/2] Add a Makefile
+Date: Mon, 10 Jun 2024 17:09:11 -0400
+Message-ID: <[email protected]>
+In-Reply-To: <[email protected]>
+References: <[email protected]>
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+
+How are people supposed to build this without a Makefile?
+
+Signed-off-by: Adam Hassick <[email protected]>
+---
+ Makefile | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+ create mode 100644 Makefile
+
+diff --git a/Makefile b/Makefile
+new file mode 100644
+index 0000000..2126a0e
+--- /dev/null
++++ b/Makefile
+@@ -0,0 +1,9 @@
++
++CC=gcc
++
++test: test.c
++	$(CC) -O2 -march=native -mtune=native test.c -o test
++
++test-debug: test.c
++	$(CC) -O0 -g test.c -o test
++
+--
+2.45.2

patchwork/tests/series/dependency-multi-2.mbox.template

@@ -0,0 +1,110 @@
+From [email protected] Wed Jun 12 20:40:05 2024
+Return-Path: <[email protected]>
+From: Adam Hassick <[email protected]>
+To: [email protected]
+Cc: Adam Hassick <[email protected]>
+Subject: [PATCH v1 0/2] More changes
+Date: Wed, 12 Jun 2024 16:40:05 -0400
+Message-ID: <[email protected]>
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+
+Tests.
+
+Adam Hassick (2):
+  test: Change the test function
+  Fix Makefile
+
+ Makefile |  2 +-
+ test.c   | 10 ++++++++--
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+--
+2.45.2
+
+
+From [email protected] Wed Jun 12 20:40:06 2024
+Return-Path: <[email protected]>
+From: Adam Hassick <[email protected]>
+To: [email protected]
+Cc: Adam Hassick <[email protected]>
+Subject: [PATCH v1 1/2] test: Change the test function
+Date: Wed, 12 Jun 2024 16:40:06 -0400
+Message-ID: <[email protected]>
+In-Reply-To: <[email protected]>
+References: <[email protected]>
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+
+I don't like what it did before. Let's make it do something more
+interesting this time.
+
+Depends-on: {depends_token_1}
+Signed-off-by: Adam Hassick <[email protected]>
+---
+ test.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/test.c b/test.c
+index f6cd16e..a868311 100644
+--- a/test.c
++++ b/test.c
+@@ -1,11 +1,17 @@
+
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+
+ // This function does things.
+ void thingymabob(char *string) {{
+-	printf("Here's your argument: %s\n", string);
+-	printf("Here is the length of your argument: %li\n", strlen(string));
++	double f = atof(string);
++
++	if (f > 5.0) {{
++		printf("I'm satisfied.\n");
++	}} else {{
++		fprintf(stderr, "I'm not satisfied.\n");
++	}}
+ }}
+
+ // Entry point.
+--
+2.45.2
+
+
+From [email protected] Wed Jun 12 20:40:07 2024
+Return-Path: <[email protected]>
+From: Adam Hassick <[email protected]>
+To: [email protected]
+Cc: Adam Hassick <[email protected]>
+Subject: [PATCH v1 2/2] Fix Makefile
+Date: Wed, 12 Jun 2024 16:40:07 -0400
+Message-ID: <[email protected]>
+X-Mailer: git-send-email 2.45.2
+In-Reply-To: <[email protected]>
+References: <[email protected]>
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+
+The test-debug target did not generate the correct file.
+
+Depends-on: {depends_token_2}
+Signed-off-by: Adam Hassick <[email protected]>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 3583b93..78a2bf0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -9,5 +9,5 @@ test: test.c
+	$(CC) -O2 -march=native -mtune=native -Wall -Werror -pedantic test.c -o test
+
+ test-debug: test.c
+-	$(CC) -O0 -g test.c -Wall -Werror -pedantic -o test
++	$(CC) -O0 -g test.c -Wall -Werror -pedantic -o test-debug
+
+--
+2.45.2