From 75bb98437a04be3ac6974892aa0b446de6b08d30 Mon Sep 17 00:00:00 2001
From: Jean Delvare <jdelvare@suse.de>
Date: Tue, 9 Jun 2020 11:24:52 +0200
Subject: tests: De-duplicate no-series tests

Test all commands, including annotate and patches, in the no-series
test case, and check the error code returned too.

Remove no-series checks from all other test cases, as testing the
same code path twice is a waste of time.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
---
 test/delete.test    |  3 ---
 test/no-series.test | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 test/three.test     | 33 ---------------------------------
 3 files changed, 49 insertions(+), 36 deletions(-)

(limited to 'test')

diff --git a/test/delete.test b/test/delete.test
index 24c82b5..4256e08 100644
--- a/test/delete.test
+++ b/test/delete.test
@@ -2,9 +2,6 @@ Test the delete command.
 
 	$ mkdir patches
 
-	$ quilt delete
-	> No series file found
-
 	$ cat > test.txt
 	< Calling pci_match_id() would be more feasible.
 
diff --git a/test/no-series.test b/test/no-series.test
index c95ae8d..f4b22a9 100644
--- a/test/no-series.test
+++ b/test/no-series.test
@@ -1,56 +1,105 @@
 # Test case for when no series file exists.
 
 $ mkdir patches
+$ touch file
+
+$ quilt annotate file
+> No series file found
+$ echo %{?}
+> 1
 
 $ quilt applied
 > No series file found
+$ echo %{?}
+> 1
 
 $ quilt diff
 > No series file found
+$ echo %{?}
+> 1
 
 $ quilt files
 > No series file found
+$ echo %{?}
+> 1
 $ quilt files -v
 > No series file found
+$ echo %{?}
+> 1
 
 $ quilt fork
 > No series file found
+$ echo %{?}
+> 1
 
 $ quilt graph
 > No series file found
+$ echo %{?}
+> 1
 
 $ quilt header
 > No series file found
+$ echo %{?}
+> 1
 
 $ quilt next
 > No series file found
+$ echo %{?}
+> 1
+
+$ quilt patches file
+> No series file found
+$ echo %{?}
+> 1
 
 $ quilt pop
 > No series file found
+$ echo %{?}
+> 1
 $ quilt pop -v
 > No series file found
+$ echo %{?}
+> 1
 
 $ quilt previous
 > No series file found
+$ echo %{?}
+> 1
 
 $ quilt push
 > No series file found
+$ echo %{?}
+> 1
 $ quilt push -v
 > No series file found
+$ echo %{?}
+> 1
 
 $ quilt refresh
 > No series file found
+$ echo %{?}
+> 1
 
 $ quilt series
 > No series file found
+$ echo %{?}
+> 1
 $ quilt series -v
 > No series file found
+$ echo %{?}
+> 1
 
 $ quilt snapshot
 > No series file found
+$ echo %{?}
+> 1
 
 $ quilt top
 > No series file found
+$ echo %{?}
+> 1
 
 $ quilt unapplied
 > No series file found
+$ echo %{?}
+> 1
diff --git a/test/three.test b/test/three.test
index 8302ada..bb4e6b9 100644
--- a/test/three.test
+++ b/test/three.test
@@ -1,38 +1,5 @@
 	$ mkdir patches
 
-	$ touch e
-	$ quilt annotate e
-	> No series file found
-
-	$ quilt top
-	> No series file found
-
-	$ quilt next
-	> No series file found
-
-	$ quilt previous
-	> No series file found
-
-	$ quilt unapplied
-	> No series file found
-
-	$ quilt applied
-	> No series file found
-
-	$ quilt next patch1
-	> No series file found
-
-	$ quilt push patch1
-	> No series file found
-
-	$ quilt push
-	> No series file found
-
-	$ quilt pop
-	> No series file found
-	$ echo %{?}
-	> 1
-
 	$ quilt new patch1.diff
 	> Patch %{P}patch1.diff is now on top
 
-- 
cgit