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 6e61f18bba1b2ce10bbe3dba02f249a45f9bc7bc..0fc20784845bfa6b8f87b8aea14efef0934db9e3 100644 (file)
--- 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 847ccdc2235f53eafa7615e3ca93243f2db95220..150605766d6ca4a4871a7f934bcb219e53c31799 100644 (file)
--- 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 87d94a5b65d1077e241d029b96c36e01f89879b3..60769a0372e0ef91658111cd867ce3bd86db3ec6 100644 (file)
--- 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 d15bb7d4b684fd8a56fea4e7f73179f0903b5269..08861863be968e1b46a95811bfff8ab78e1e22fa 100644 (file)
--- 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 76bb5ec76291b753a7144919788ac38fb5ee4521..c31a1b1299f3d983e4f36e1481bf34f37792685f 100644 (file)
--- 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 ba62bd7f3d16ecbddfc8893e752e7bc22e786fc7..c40e242ce1bc509374eac9bf5aa541a0a2ec4a89 100644 (file)
--- 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 6a8673f88dcae850d9862e97c01a1c2f69689031..d0891b56bccd65f844c28c521f5e97265da48e7e 100644 (file)
--- 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 ccb1828d00b8e3d478541a11b83ef3fd1c428543..e5c6de78fc91da18c7108b35095104e2175cc4c5 100644 (file)
--- 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 90f59eb6e21a596c4139ccd3111873a20aebb67c..a82daf89ee5ec2509cdde9e570f3f46048d84d6d 100644 (file)
--- 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 686059dfa2f902bb56f35fde7cc79b0faefe2fba..09766ffdac09eabc5ab77131decdd72ea0597e8d 100644 (file)
--- 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 377819ae47594d1cbabaa989682d6a4823fe484f..213bdd2e2a1f8d6e9e0d45a79b5a413fa12676b3 100644 (file)
--- 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