diff options
| author | Dan McGee <dan@archlinux.org> | 2012-02-06 12:50:48 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-02-06 12:50:48 +0100 |
| commit | f55be4897799c5a6dcb454455ad9edcfc36f8495 (patch) | |
| tree | dd87b34de4b85f307d5dd05f6d576aadc3ad3697 /test | |
| parent | b488f229d2ec4f2e4b9e746d68422460ca664715 (diff) | |
| parent | b7c06d6d678ebe6a434b2387c3bda14647113f32 (diff) | |
| download | pacman-f55be4897799c5a6dcb454455ad9edcfc36f8495.tar.gz pacman-f55be4897799c5a6dcb454455ad9edcfc36f8495.tar.xz | |
Merge branch 'maint'
Conflicts:
lib/libalpm/alpm_list.c
Diffstat (limited to 'test')
| -rw-r--r-- | test/pacman/tests/upgrade001.py | 1 | ||||
| -rw-r--r-- | test/pacman/tests/upgrade002.py | 1 | ||||
| -rw-r--r-- | test/pacman/tests/upgrade003.py | 1 | ||||
| -rw-r--r-- | test/pacman/tests/upgrade004.py | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/test/pacman/tests/upgrade001.py b/test/pacman/tests/upgrade001.py index 2e85ce67..73fd6727 100644 --- a/test/pacman/tests/upgrade001.py +++ b/test/pacman/tests/upgrade001.py @@ -12,6 +12,7 @@ self.addpkg(p) self.args = "-U %s" % p.filename() +self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=dummy|1.0-2") for f in lp.files: self.addrule("FILE_MODIFIED=%s" % f) diff --git a/test/pacman/tests/upgrade002.py b/test/pacman/tests/upgrade002.py index c7706efe..310cde6e 100644 --- a/test/pacman/tests/upgrade002.py +++ b/test/pacman/tests/upgrade002.py @@ -12,6 +12,7 @@ self.addpkg(p) self.args = "-U %s" % p.filename() +self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=dummy|1.0-1") for f in lp.files: self.addrule("FILE_MODIFIED=%s" % f) diff --git a/test/pacman/tests/upgrade003.py b/test/pacman/tests/upgrade003.py index 284c9f35..193f0413 100644 --- a/test/pacman/tests/upgrade003.py +++ b/test/pacman/tests/upgrade003.py @@ -12,6 +12,7 @@ self.addpkg(p) self.args = "-U %s" % p.filename() +self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=dummy|1.0-1") for f in lp.files: self.addrule("FILE_MODIFIED=%s" % f) diff --git a/test/pacman/tests/upgrade004.py b/test/pacman/tests/upgrade004.py index 31daf915..6a4cdf07 100644 --- a/test/pacman/tests/upgrade004.py +++ b/test/pacman/tests/upgrade004.py @@ -7,6 +7,7 @@ self.addpkg(p) self.args = "-U %s" % p.filename() +self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=dummy") for f in p.files: self.addrule("FILE_EXIST=%s" % f) |