diff options
Diffstat (limited to 'test/pacman')
| -rw-r--r-- | test/pacman/README | 1 | ||||
| -rw-r--r-- | test/pacman/pmrule.py | 3 | ||||
| -rw-r--r-- | test/pacman/tests/upgrade015.py | 1 | ||||
| -rw-r--r-- | test/pacman/tests/upgrade016.py | 5 | ||||
| -rw-r--r-- | test/pacman/tests/upgrade027.py | 1 | ||||
| -rw-r--r-- | test/pacman/tests/upgrade028.py | 1 | ||||
| -rw-r--r-- | test/pacman/tests/upgrade029.py | 1 | 
7 files changed, 2 insertions, 11 deletions
| diff --git a/test/pacman/README b/test/pacman/README index 8d8354ab..6c601b2f 100644 --- a/test/pacman/README +++ b/test/pacman/README @@ -310,7 +310,6 @@ its DEPENDS field.    FILE_TYPE=path/to/file|type  (possible types: dir, file, link)    FILE_PACNEW=path/to/file    FILE_PACSAVE=path/to/file -  FILE_PACORIG=path/to/file  Example:  	FILE_EXIST=etc/test.conf diff --git a/test/pacman/pmrule.py b/test/pacman/pmrule.py index c2336c5d..8e6b2c0c 100644 --- a/test/pacman/pmrule.py +++ b/test/pacman/pmrule.py @@ -146,9 +146,6 @@ class pmrule(object):              elif case == "PACNEW":                  if not os.path.isfile("%s.pacnew" % filename):                      success = 0 -            elif case == "PACORIG": -                if not os.path.isfile("%s.pacorig" % filename): -                    success = 0              elif case == "PACSAVE":                  if not os.path.isfile("%s.pacsave" % filename):                      success = 0 diff --git a/test/pacman/tests/upgrade015.py b/test/pacman/tests/upgrade015.py index ea6046cb..64fe2813 100644 --- a/test/pacman/tests/upgrade015.py +++ b/test/pacman/tests/upgrade015.py @@ -12,4 +12,3 @@ self.addrule("PACMAN_RETCODE=0")  self.addrule("PKG_EXIST=dummy")  self.addrule("FILE_MODIFIED=etc/dummy.conf")  self.addrule("!FILE_PACNEW=etc/dummy.conf") -self.addrule("!FILE_PACORIG=etc/dummy.conf") diff --git a/test/pacman/tests/upgrade016.py b/test/pacman/tests/upgrade016.py index b6b3f3ae..ddf57e8c 100644 --- a/test/pacman/tests/upgrade016.py +++ b/test/pacman/tests/upgrade016.py @@ -11,6 +11,5 @@ self.args = "-U --force %s" % p.filename()  self.addrule("PACMAN_RETCODE=0")  self.addrule("PKG_EXIST=dummy") -self.addrule("FILE_MODIFIED=etc/dummy.conf") -self.addrule("!FILE_PACNEW=etc/dummy.conf") -self.addrule("FILE_PACORIG=etc/dummy.conf") +self.addrule("!FILE_MODIFIED=etc/dummy.conf") +self.addrule("FILE_PACNEW=etc/dummy.conf") diff --git a/test/pacman/tests/upgrade027.py b/test/pacman/tests/upgrade027.py index 99087f34..3dd694af 100644 --- a/test/pacman/tests/upgrade027.py +++ b/test/pacman/tests/upgrade027.py @@ -18,5 +18,4 @@ self.addrule("PACMAN_RETCODE=0")  self.addrule("PKG_VERSION=dummy|1.0-2")  self.addrule("FILE_PACNEW=etc/dummy.conf")  self.addrule("!FILE_PACSAVE=etc/dummy.conf") -self.addrule("!FILE_PACORIG=etc/dummy.conf")  self.addrule("FILE_EXIST=etc/dummy.conf") diff --git a/test/pacman/tests/upgrade028.py b/test/pacman/tests/upgrade028.py index 18a10f57..1e31aa31 100644 --- a/test/pacman/tests/upgrade028.py +++ b/test/pacman/tests/upgrade028.py @@ -18,5 +18,4 @@ self.addrule("PACMAN_RETCODE=0")  self.addrule("PKG_VERSION=dummy|1.0-2")  self.addrule("!FILE_PACNEW=etc/dummy.conf")  self.addrule("!FILE_PACSAVE=etc/dummy.conf") -self.addrule("!FILE_PACORIG=etc/dummy.conf")  self.addrule("FILE_EXIST=etc/dummy.conf") diff --git a/test/pacman/tests/upgrade029.py b/test/pacman/tests/upgrade029.py index c308f426..eef5c700 100644 --- a/test/pacman/tests/upgrade029.py +++ b/test/pacman/tests/upgrade029.py @@ -20,5 +20,4 @@ self.addrule("PACMAN_RETCODE=1")  self.addrule("PKG_VERSION=dummy|1.0-1")  self.addrule("!FILE_PACNEW=etc/dummy.conf")  self.addrule("!FILE_PACSAVE=etc/dummy.conf") -self.addrule("!FILE_PACORIG=etc/dummy.conf")  self.addrule("FILE_EXIST=etc/dummy.conf") | 
