# HG changeset patch # User Raphaël Gomès <rgomes@octobus.net> # Date 1584632647 -3600 # Thu Mar 19 16:44:07 2020 +0100 # Node ID 76512c22373bb30ade2d070bcb27bd6d06050886 # Parent 3ad0caf7884e5cf40bf3d3082eb591d5cafaa07e Update tests to reflect the new output from tarballs of uncleans diff --git a/tests/test-find-asv-variants.t b/tests/test-find-asv-variants.t --- a/tests/test-find-asv-variants.t +++ b/tests/test-find-asv-variants.t @@ -227,4 +227,5 @@ {'pull': {'noop': {'same': {'my-reference-I-5a458da3': {'source': 'reference', 'target': 'same'}, 'my-reference-I-a9c79cd2': {'source': 'reference', - 'target': 'same'}}}}}) + 'target': 'same'}}}}}, + {'my-reference-I-5a458da3': {}, 'my-reference-I-a9c79cd2': {}}) diff --git a/tests/test-setup-repos.t b/tests/test-setup-repos.t --- a/tests/test-setup-repos.t +++ b/tests/test-setup-repos.t @@ -36,7 +36,7 @@ > target: "same" > EOF -make the tarbal +make the tarball $ mkdir reference-tmp $ cd reference-tmp @@ -68,6 +68,42 @@ > test2repo-99d3d864 > EOF +make uncleans tarballs +------------------ + + $ mkdir uncleans-tarballs + $ mkdir ignored99d3d864 + $ touch ignored99d3d864/a ignored99d3d864/b + $ mkdir ignored7a4bd238 + $ touch ignored7a4bd238/whatever ignored7a4bd238/other.ext + $ tar cf uncleans-tarballs/99d3d864-ignored.tar ignored99d3d864/a ignored99d3d864/b + $ tar cf uncleans-tarballs/7a4bd238-ignored.tar ignored7a4bd238/whatever ignored7a4bd238/other.ext + + $ mkdir unknowns99d3d864 + $ touch unknowns99d3d864/a unknowns99d3d864/b + $ mkdir unknowns7a4bd238 + $ touch unknowns7a4bd238/whatever unknowns7a4bd238/other.ext + $ tar cf uncleans-tarballs/99d3d864-unknown.tar unknowns99d3d864/a unknowns99d3d864/b + $ tar cf uncleans-tarballs/7a4bd238-unknown.tar unknowns7a4bd238/whatever unknowns7a4bd238/other.ext + + $ mv uncleans-tarballs/* $TESTTMP/reference-tar/ + + $ cat << EOF >> $TESTTMP/editor-7a4bd238 + > echo 'uncleans-tarballs:' >> "\$1" + > echo ' ignored: 7a4bd238-ignored.tar' >> "\$1" + > echo ' unknown: 7a4bd238-unknown.tar' >> "\$1" + > EOF + $ chmod +x $TESTTMP/editor-7a4bd238 + $ EDITOR=$TESTTMP/editor-7a4bd238 update-reference-config $TESTTMP/reference-tar/test1repo-7a4bd238-reference.tar + + $ cat << EOF >> $TESTTMP/editor-99d3d864 + > echo 'uncleans-tarballs:' >> "\$1" + > echo ' ignored: 99d3d864-ignored.tar' >> "\$1" + > echo ' unknown: 99d3d864-unknown.tar' >> "\$1" + > EOF + $ chmod +x $TESTTMP/editor-99d3d864 + $ EDITOR=$TESTTMP/editor-99d3d864 update-reference-config $TESTTMP/reference-tar/test2repo-99d3d864-reference.tar + Test the setup-script ===================== @@ -86,6 +122,8 @@ downloading repo partial reference: same downloading repo + tarballs of uncleans: ignored + tarballs of uncleans: unknown Setting up reference repository: test2repo-99d3d864 main reference downloading repo @@ -94,6 +132,8 @@ downloading repo partial reference: same downloading repo + tarballs of uncleans: ignored + tarballs of uncleans: unknown $ ls -d1 $TESTTMP/repos/* $TESTTMP/repos/*/.hg/scm-perf-repo-digest $TESTTMP/repos/partial-references/* $TESTTMP/repos/partial-references/*/.hg/scm-perf-repo-digest $TESTTMP/repos/partial-references $TESTTMP/repos/partial-references/test1repo-7a4bd238-partial-missing-last-10 @@ -110,6 +150,7 @@ $TESTTMP/repos/test2repo-99d3d864-reference $TESTTMP/repos/test2repo-99d3d864-reference/.hg/scm-perf-repo-digest $TESTTMP/repos/test2repo-99d3d864.benchrepo + $TESTTMP/repos/uncleans-tarballs Check the reference repository are updated @@ -163,6 +204,12 @@ nf7 nf8 nf9 + + $TESTTMP/repos/uncleans-tarballs: + 7a4bd238-ignored.tar + 7a4bd238-unknown.tar + 99d3d864-ignored.tar + 99d3d864-unknown.tar Check the partial variant has not been updated @@ -187,6 +234,10 @@ already up to date partial reference: same already up to date + tarballs of uncleans: ignored + already up to date + tarballs of uncleans: unknown + already up to date Setting up reference repository: test2repo-99d3d864 main reference already up to date @@ -194,6 +245,10 @@ already up to date partial reference: same already up to date + tarballs of uncleans: ignored + already up to date + tarballs of uncleans: unknown + already up to date Does setup missing variants if any ---------------------------------- @@ -208,6 +263,10 @@ already up to date partial reference: same already up to date + tarballs of uncleans: ignored + already up to date + tarballs of uncleans: unknown + already up to date Setting up reference repository: test2repo-99d3d864 main reference already up to date @@ -215,6 +274,10 @@ already up to date partial reference: same downloading repo + tarballs of uncleans: ignored + already up to date + tarballs of uncleans: unknown + already up to date Does setup missing main if any ------------------------------ @@ -231,6 +294,10 @@ downloading repo partial reference: same downloading repo + tarballs of uncleans: ignored + already up to date + tarballs of uncleans: unknown + already up to date Setting up reference repository: test2repo-99d3d864 main reference already up to date @@ -238,6 +305,10 @@ already up to date partial reference: same already up to date + tarballs of uncleans: ignored + already up to date + tarballs of uncleans: unknown + already up to date Partial download get reset -------------------------- @@ -258,6 +329,10 @@ already up to date partial reference: same already up to date + tarballs of uncleans: ignored + already up to date + tarballs of uncleans: unknown + already up to date Setting up reference repository: test2repo-99d3d864 main reference already up to date @@ -265,6 +340,10 @@ already up to date partial reference: same downloading repo + tarballs of uncleans: ignored + already up to date + tarballs of uncleans: unknown + already up to date $ ls $TESTTMP/repos/partial-references/test2*same/.hg/scm-perf-repo-digest $TESTTMP/repos/partial-references/test2repo-99d3d864-partial-same/.hg/scm-perf-repo-digest $ ls $TESSTTMP/repos/partial-references/test2*same/.hg/foo @@ -291,6 +370,8 @@ already up to date partial reference: same already up to date + tarballs of uncleans: ignored + tarballs of uncleans: unknown Setting up reference repository: test2repo-99d3d864 main reference already up to date @@ -298,6 +379,10 @@ already up to date partial reference: same already up to date + tarballs of uncleans: ignored + already up to date + tarballs of uncleans: unknown + already up to date wrong invocation ---------------- @@ -310,7 +395,7 @@ When missing, data are fetched from SOURCE (default: https://static.octobus.net/asv/) [128] - $ setup-repos foo bar baz fuzz + $ setup-repos foo bar baz fuzz bizz usage: %s REPOS-FILE [DIRECTORY [SOURCE]] Make sure all item in REPOS-FILE are setup in DIRECTORY. diff --git a/tests/test-smoke-test-python3.t b/tests/test-smoke-test-python3.t --- a/tests/test-smoke-test-python3.t +++ b/tests/test-smoke-test-python3.t @@ -199,6 +199,7 @@ skip.json smoke-test-A-f62f46ce-reference smoke-test-A-f62f46ce.benchrepo + uncleans-tarballs $ ls repos/partial-references/ smoke-test-A-f62f46ce-partial-same diff --git a/tests/test-smoke-test.t b/tests/test-smoke-test.t --- a/tests/test-smoke-test.t +++ b/tests/test-smoke-test.t @@ -286,6 +286,7 @@ smoke-test-A-f62f46ce.benchrepo smoke-test-B-9b2e6e3e-reference smoke-test-B-9b2e6e3e.benchrepo + uncleans-tarballs $ ls repos/partial-references/ smoke-test-A-f62f46ce-partial-last-hundred