From: Michael R Sweet <msweet@msweet.org>
Date: Tue, 2 Apr 2024 14:51:19 +0000 (-0400)
Subject: Drop 'none' test (Issue #909)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c8f7dd84c45b844aef62730b3acc64f0bc8f699;p=thirdparty%2Fcups.git

Drop 'none' test (Issue #909)
---

diff --git a/CHANGES.md b/CHANGES.md
index 74113d5974..f1e48809d5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -24,6 +24,7 @@ Changes in CUPS v2.5b1 (TBA)
   (Issue #751)
 - Updated `httpAddrConnect2()` to handle `POLLHUP` together with `POLLIN` or
   `POLLOUT` (Issue #839)
+- Updated the "get-printer-attributes-suite.test" test file (Issue #909)
 - Updated `cupsRasterReadPixels` and `cupsRasterWritePixels` to not try reading
   or writing if the number of bytes passed is 0 (Issue #914)
 - Fixed use-after-free in `cupsdAcceptClient()` when we log warning during error
diff --git a/examples/get-printer-attributes-suite.test b/examples/get-printer-attributes-suite.test
index e46896a5e3..a8843b48f4 100644
--- a/examples/get-printer-attributes-suite.test
+++ b/examples/get-printer-attributes-suite.test
@@ -256,88 +256,6 @@ VERSION 2.0
 	EXPECT ?sides-supported OF-TYPE keyword IN-GROUP printer-attributes-tag WITH-VALUE "/^(one-sided|two-sided-long-edge|two-sided-short-edge)$$/"
 }
 
-{
-	NAME "Get-Printer-Attributes (requested-attributes='none')"
-
-	OPERATION Get-Printer-Attributes
-
-	GROUP operation-attributes-tag
-	ATTR charset attributes-charset utf-8
-	ATTR language attributes-natural-language en
-	ATTR uri printer-uri $uri
-	ATTR keyword requested-attributes 'none'
-
-	STATUS successful-ok
-
-	# 'media-col-database' attribute should never be returned unless
-	# explicitly requested...
-	EXPECT !media-col-database
-
-	# 'printer-description' attributes
-	EXPECT !charset-configured
-	EXPECT !charset-supported
-	EXPECT !color-supported
-	EXPECT !compression-supported
-	EXPECT !document-format-default
-	EXPECT !document-format-supported
-	EXPECT !generated-natural-language-supported
-	EXPECT !ipp-versions-supported
-	EXPECT !job-impressions-supported
-	EXPECT !multiple-document-jobs-supported
-	EXPECT !multiple-operation-time-out
-	EXPECT !natural-language-configured
-        EXPECT !operations-supported
-	EXPECT !pdl-override-supported
-	EXPECT !printer-info
-	EXPECT !printer-location
-	EXPECT !printer-make-and-model
-	EXPECT !printer-name
-	EXPECT !pages-per-minute-color
-	EXPECT !pages-per-minute
-	EXPECT !printer-current-time
-	EXPECT !printer-is-accepting-jobs
-	EXPECT !printer-more-info
-	EXPECT !printer-state
-	EXPECT !printer-state-message
-	EXPECT !printer-state-reasons
-	EXPECT !printer-up-time
-	EXPECT !printer-uri-supported
-	EXPECT !queued-job-count
-	EXPECT !uri-authentication-supported
-	EXPECT !uri-security-supported
-
-	# 'job-template' attributes
-	EXPECT !copies-default
-	EXPECT !copies-supported
-	EXPECT !finishings-default
-	EXPECT !finishings-supported
-	EXPECT !job-hold-until-default
-	EXPECT !job-hold-until-supported
-	EXPECT !job-hold-until-default
-	EXPECT !job-hold-until-supported
-	EXPECT !job-priority-default
-	EXPECT !job-priority-supported
-	EXPECT !job-sheets-default
-	EXPECT !job-sheets-supported
-	EXPECT !media-default
-	EXPECT !media-ready
-	EXPECT !media-supported
-	EXPECT !multiple-document-handling-default
-	EXPECT !multiple-document-handling-supported
-	EXPECT !number-up-default
-	EXPECT !number-up-supported
-	EXPECT !number-up-supported
-	EXPECT !orientation-requested-default
-	EXPECT !orientation-requested-supported
-	EXPECT !pages-ranges-supported
-	EXPECT !print-quality-default
-	EXPECT !print-quality-supported
-	EXPECT !printer-resolution-default
-	EXPECT !printer-resolution-supported
-	EXPECT !sides-default
-	EXPECT !sides-supported
-}
-
 {
 	NAME "Get-Printer-Attributes (requested-attributes='media-col-database')"