[gentoo-commits] proj/portage-utils:master commit in: tests/qcheck/

[gentoo-commits] proj/portage-utils:master commit in: tests/qcheck/

[Mike Frysinger]

commit:     0c7050208c110faac5dd54a452ed60a7a40eae07
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue May 19 17:33:28 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue May 19 17:34:38 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=0c705020

tests: qcheck: tweak some tests output

Since qcheck doesn't sort its vdb walking, make sure our tests don't
assume the package list is stable.  We could change qcheck, but not
sure that's needed.

 tests/qcheck/dotest      | 11 +++++++----
 tests/qcheck/list04.good |  4 ++--
 tests/qcheck/list05.good |  4 ++--
 tests/qcheck/list06.good |  4 ++--
 tests/qcheck/list07.good |  4 ++--
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/tests/qcheck/dotest b/tests/qcheck/dotest
index 965a5b5..016fd10 100755
--- a/tests/qcheck/dotest
+++ b/tests/qcheck/dotest
@@ -28,6 +28,9 @@ test() {
 	tend $? "$*"
 }
 
+# have to avoid the -a flag and walk one package at a time as qcheck does not
+# sort the vdb dirs before processing them.
+
 # simple check
 test 01 1 "qcheck a-b/pkg"
 
@@ -38,16 +41,16 @@ test 02 1 "qcheck a-b/pkg -s ^/missing-dir/.*"
 test 03 1 "qcheck -Ba"
 
 # hash mismatch ignore check
-test 04 1 "qcheck -Ha"
+test 04 1 "qcheck -H cat/pkg && qcheck -H a-b/pkg"
 
 # mtime mismatch ignore check
-test 05 1 "qcheck -Ta"
+test 05 1 "qcheck -T cat/pkg && qcheck -T a-b/pkg"
 
 # missing ignore check
-test 06 1 "qcheck -Aa"
+test 06 1 "qcheck -A cat/pkg && qcheck -A a-b/pkg"
 
 # hash+mtime+missing mismatch ignore check
-test 07 0 "qcheck -AHTa"
+test 07 0 "qcheck -AHT cat/pkg && qcheck -AHT a-b/pkg"
 
 # verbose check
 test 08 1 "qcheck -v a-b/pkg"

diff --git a/tests/qcheck/list04.good b/tests/qcheck/list04.good
index 930f896..943e0f5 100644
--- a/tests/qcheck/list04.good
+++ b/tests/qcheck/list04.good
@@ -1,3 +1,5 @@
+Checking cat/pkg-1 ...
+  * 0 out of 0 file are good
 Checking a-b/pkg-1.0 ...
  MTIME: /bin/bad-mtime-obj
  MTIME: /bin/bad-mtime-sym
@@ -7,5 +9,3 @@ Checking a-b/pkg-1.0 ...
  AFK: /missing-dir/missing-file
  AFK: /missing-dir/missing-sym
   * 4 out of 11 files are good (2 files were ignored)
-Checking cat/pkg-1 ...
-  * 0 out of 0 file are good

diff --git a/tests/qcheck/list05.good b/tests/qcheck/list05.good
index d4c4243..b1a8955 100644
--- a/tests/qcheck/list05.good
+++ b/tests/qcheck/list05.good
@@ -1,3 +1,5 @@
+Checking cat/pkg-1 ...
+  * 0 out of 0 file are good
 Checking a-b/pkg-1.0 ...
  MD5-DIGEST: /bin/bad-md5
  SHA1-DIGEST: /bin/bad-sha1
@@ -7,5 +9,3 @@ Checking a-b/pkg-1.0 ...
  AFK: /missing-dir/missing-file
  AFK: /missing-dir/missing-sym
   * 4 out of 11 files are good (2 files were ignored)
-Checking cat/pkg-1 ...
-  * 0 out of 0 file are good

diff --git a/tests/qcheck/list06.good b/tests/qcheck/list06.good
index 3cd48f7..7b770a5 100644
--- a/tests/qcheck/list06.good
+++ b/tests/qcheck/list06.good
@@ -1,8 +1,8 @@
+Checking cat/pkg-1 ...
+  * 0 out of 0 file are good
 Checking a-b/pkg-1.0 ...
  MD5-DIGEST: /bin/bad-md5
  MTIME: /bin/bad-mtime-obj
  SHA1-DIGEST: /bin/bad-sha1
  MTIME: /bin/bad-mtime-sym
   * 4 out of 8 files are good (5 files were ignored)
-Checking cat/pkg-1 ...
-  * 0 out of 0 file are good

diff --git a/tests/qcheck/list07.good b/tests/qcheck/list07.good
index fb59689..4a86950 100644
--- a/tests/qcheck/list07.good
+++ b/tests/qcheck/list07.good
@@ -1,4 +1,4 @@
-Checking a-b/pkg-1.0 ...
-  * 4 out of 4 files are good (9 files were ignored)
 Checking cat/pkg-1 ...
   * 0 out of 0 file are good
+Checking a-b/pkg-1.0 ...
+  * 4 out of 4 files are good (9 files were ignored)

[gentoo-commits] proj/portage-utils:master commit in: tests/qcheck/

[Mike Frysinger]

commit:     359fe5097ca531291a2cbb878dc6940351a7a358
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 11 09:51:22 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Jun 11 09:51:22 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=359fe509

tests: qcheck: fix timezone handling

Make sure the stamps are pinned to UTC rather than using the active TZ.

URL: https://bugs.gentoo.org/551718
Reported-by: Jeroen Roovers <jer <AT> gentoo.org>

 tests/qcheck/dotest | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/qcheck/dotest b/tests/qcheck/dotest
index 965a5b5..9122321 100755
--- a/tests/qcheck/dotest
+++ b/tests/qcheck/dotest
@@ -10,8 +10,8 @@ export Q_VDB=/
 # This is the "valid" mtime the test packages have hardcoded in the CONTENTS
 # files.  The stamp is the CONTENTS while the touch date is the corresponding
 # unpacked date.
-STAMP=1398954900 DATE=201405011035
-find "${ROOT}" -exec touch -h -t "${DATE}" {} +
+STAMP=1398954900 DATE='2014-05-01T14:35:00Z'
+find "${ROOT}" -exec touch -h -d "${DATE}" {} +
 
 mktmpdir
 

[gentoo-commits] proj/portage-utils:master commit in: tests/qcheck/

[Fabian Groffen]

commit:     8c2d770ba0fc714a20c937b3b9fb7e732665e86d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 23 16:52:35 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Mar 23 16:52:35 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=8c2d770b

qcheck: don't require ownership to be preserved by cp

ownership isn't really an issue here, so don't fail on it

 tests/qcheck/dotest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/qcheck/dotest b/tests/qcheck/dotest
index d7c337b..fa1feed 100755
--- a/tests/qcheck/dotest
+++ b/tests/qcheck/dotest
@@ -54,7 +54,7 @@ test 08 1 "qcheck -v a-b/pkg"
 
 # update check
 (
-cp -a "${ROOT}" mod
+cp -PR --preserve=mode,timestamps "${ROOT}" mod
 ROOT=${PWD}/mod
 test 09 0 "qcheck -u a-b/pkg && qcheck a-b/pkg"
 )