From: msweet Date: Thu, 2 May 2013 14:53:23 +0000 (+0000) Subject: Fix several ipptool test files that used old STATUS names. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71b4e7d9842ebb12fccfde1dc1cb29eb9c560b50;p=thirdparty%2Fcups.git Fix several ipptool test files that used old STATUS names. Update docos. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10970 7a7537e8-13f0-0310-91df-b6672ffda945 --- diff --git a/CHANGES-IPPTOOL.txt b/CHANGES-IPPTOOL.txt index 6e61f18bba..0fc2078484 100644 --- a/CHANGES-IPPTOOL.txt +++ b/CHANGES-IPPTOOL.txt @@ -1,9 +1,13 @@ -CHANGES-IPPTOOL.txt - 2013-04-18 +CHANGES-IPPTOOL.txt - 2013-05-02 -------------------------------- This file provides a list of changes to the ipptool binary distribution posted on cups.org. +2013-05-02 + + - Fixed several ipptool test files that used old STATUS names. + 2013-04-18 diff --git a/IPPTOOL.txt b/IPPTOOL.txt index 847ccdc223..150605766d 100644 --- a/IPPTOOL.txt +++ b/IPPTOOL.txt @@ -1,4 +1,4 @@ -IPPTOOL.txt - 2013-04-18 +IPPTOOL.txt - 2013-05-02 ------------------------ See the file CHANGES-IPPTOOL.txt for a list of changes to this software. @@ -57,7 +57,7 @@ STANDARD TEST FILES get-notifications.test Shows events for an ippget subscription. get-printer-attributes.test Shows printer attributes - get-subscription.test Shows a list of subscriptions + get-subscriptions.test Shows a list of subscriptions ipp-1.1.test IPP/1.1 conformance test suite ipp-2.0.test IPP/2.0 conformance test suite ipp-2.1.test IPP/2.1 conformance test suite diff --git a/test/create-job-format.test b/test/create-job-format.test index 87d94a5b65..60769a0372 100644 --- a/test/create-job-format.test +++ b/test/create-job-format.test @@ -21,8 +21,8 @@ ATTR integer copies 1 # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes # What attributes do we expect? EXPECT job-id @@ -51,6 +51,6 @@ FILE ../data/testprint.ps # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes } diff --git a/test/create-job-sheets.test b/test/create-job-sheets.test index d15bb7d4b6..08861863be 100644 --- a/test/create-job-sheets.test +++ b/test/create-job-sheets.test @@ -21,8 +21,8 @@ ATTR name job-sheets standard # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes # What attributes do we expect? EXPECT job-id @@ -50,6 +50,6 @@ FILE ../data/testprint.ps # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes } diff --git a/test/get-devices.test b/test/get-devices.test index 76bb5ec762..c31a1b1299 100644 --- a/test/get-devices.test +++ b/test/get-devices.test @@ -16,6 +16,6 @@ ATTR uri printer-uri $uri # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes } diff --git a/test/get-job-attributes.test b/test/get-job-attributes.test index ba62bd7f3d..c40e242ce1 100644 --- a/test/get-job-attributes.test +++ b/test/get-job-attributes.test @@ -18,8 +18,8 @@ # ATTR keyword requested-attributes job-media-sheets-completed,job-state # What statuses are OK? - #STATUS ok - #STATUS ok-subst + #STATUS successful-ok + #STATUS successful-ok-ignored-or-substituted-attributes # What attributes do we expect? EXPECT job-uri diff --git a/test/get-job-attributes2.test b/test/get-job-attributes2.test index 6a8673f88d..d0891b56bc 100644 --- a/test/get-job-attributes2.test +++ b/test/get-job-attributes2.test @@ -16,8 +16,8 @@ ATTR uri job-uri $uri # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes # What attributes do we expect? EXPECT job-uri diff --git a/test/get-ppds-drv-only.test b/test/get-ppds-drv-only.test index ccb1828d00..e5c6de78fc 100644 --- a/test/get-ppds-drv-only.test +++ b/test/get-ppds-drv-only.test @@ -17,8 +17,8 @@ ATTR name include-schemes drv # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes EXPECT ppd-name } diff --git a/test/get-ppds.test b/test/get-ppds.test index 90f59eb6e2..a82daf89ee 100644 --- a/test/get-ppds.test +++ b/test/get-ppds.test @@ -16,6 +16,6 @@ ATTR uri printer-uri $uri # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes } diff --git a/test/get-subscriptions.test b/test/get-subscriptions.test index 686059dfa2..09766ffdac 100644 --- a/test/get-subscriptions.test +++ b/test/get-subscriptions.test @@ -16,6 +16,6 @@ ATTR uri printer-uri $uri # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes } diff --git a/test/set-attrs-hold.test b/test/set-attrs-hold.test index 377819ae47..213bdd2e2a 100644 --- a/test/set-attrs-hold.test +++ b/test/set-attrs-hold.test @@ -17,8 +17,8 @@ ATTR name requesting-user-name $user # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes } { @@ -45,8 +45,8 @@ FILE ../data/testprint.ps # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes # What attributes do we expect? EXPECT job-id @@ -71,8 +71,8 @@ ATTR integer job-id $job-id # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes # What attributes do we expect? EXPECT job-state @@ -101,8 +101,8 @@ ATTR name job-hold-until 00:30:00 # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes } { @@ -123,8 +123,8 @@ ATTR integer job-id $job-id # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes # What attributes do we expect? EXPECT job-state @@ -149,8 +149,8 @@ ATTR name requesting-user-name $user # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes } { @@ -171,8 +171,8 @@ ATTR integer job-id $job-id # What statuses are OK? - STATUS ok - STATUS ok-subst + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes # What attributes do we expect? EXPECT job-state