From 38ab88adc8a2c430b8ebdefe3bc0e44b8e4b463c Mon Sep 17 00:00:00 2001 From: mike Date: Mon, 3 Oct 2011 21:31:45 +0000 Subject: [PATCH] Don't do bogus URI print tests unless document-uri is set. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10047 7a7537e8-13f0-0310-91df-b6672ffda945 --- CHANGES-IPPTOOL.txt | 6 +++++- test/ipp-1.1.test | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES-IPPTOOL.txt b/CHANGES-IPPTOOL.txt index aad45c12cd..80b704647d 100644 --- a/CHANGES-IPPTOOL.txt +++ b/CHANGES-IPPTOOL.txt @@ -7,7 +7,8 @@ on cups.org. 2011-10-03 - - ipptool now supports no-value + regex checks + - Using OF-TYPE with the "no-value" or "unknown" out-of-band value tags + now works without special WITH-VALUE strings. - ipptool now shows an error when an attribute appears more than once within the same attribute group. - ipptool did not display attributes as specified by the DISPLAY @@ -22,6 +23,9 @@ on cups.org. media sizes for the printing tests. - Updated the IPP/1.1 tests to accept "no-value" for media-default an orientation-requested-default. + - Updated the IPP/1.1 tests to accept "unknown" for job-state. + - Updated the IPP/1.1 tests to not perform the bogus URI printing tests + unless the "document-uri" variable is defined. - Updated the IPP/2.0 tests to properly validate media-col "media-xxx-supported" attributes. - Updated the IPP/2.2 tests to properly validate media-ready and diff --git a/test/ipp-1.1.test b/test/ipp-1.1.test index 66ef6b1c66..8e789dcb64 100644 --- a/test/ipp-1.1.test +++ b/test/ipp-1.1.test @@ -958,6 +958,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" # Defined by: RFC 2911 section 3.2.2 { SKIP-IF-NOT-DEFINED OPTIONAL_PRINT_URI + SKIP-IF-NOT-DEFINED document-uri NAME "Print-URI with bad URI: Print-URI Operation" OPERATION Print-URI @@ -1193,6 +1194,7 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/" { SKIP-IF-NOT-DEFINED OPTIONAL_CREATE_JOB SKIP-IF-NOT-DEFINED OPTIONAL_SEND_URI + SKIP-IF-NOT-DEFINED document-uri SKIP-PREVIOUS-ERROR yes NAME "Send-URI with bad URI: Send-URI Operation (bad URI)" -- 2.47.2