summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAge
* git-debrebase: merge: Change wreckage to refs/debrebase/wreckage/*Ian Jackson2018-08-12
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: merge: New record-resolved-merge subcommand, WIPIan Jackson2018-08-12
| | | | | | | Right now this seems to be able to generate some commit, but it doesn't know how to record it. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: merge: test gdr-merge-conflicts: Test late wreckageIan Jackson2018-08-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: merge: test gdr-merge-conflicts: Break out wreckage-*Ian Jackson2018-08-11
| | | | | | NFC Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: merge: Always save wreckageIan Jackson2018-08-11
| | | | | | There is no point configuring this. We tidy it up again soon enough. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: merge: test suite: Drop check of no wreckage saveIan Jackson2018-08-11
| | | | | | We are going to make this nonconfigurable. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: merge: test suite: Check wreckage tidyingIan Jackson2018-08-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: merge: test suite: Check wreckage savingIan Jackson2018-08-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: merge: gdr-merge test: Test an early failure tooIan Jackson2018-08-11
| | | | | | And sort out the section comments. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Set DEBFULLNAMEIan Jackson2018-08-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: merge: gdr-merge-conflicts test: New testIan Jackson2018-08-11
| | | | | | Will be improved later. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: merge: gdr-merge test: sort out section commentsIan Jackson2018-08-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: merge: test: Introduce t-merge-conflicted-*Ian Jackson2018-08-11
| | | | | | NFC Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: merge: test: Drop stuff cloned from gdr-viagitIan Jackson2018-08-11
| | | | | | We don't much are about this here. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: merge: test suite: Use t-ref-same-startIan Jackson2018-08-11
| | | | | | | | This is better than t-gdr-good laundered because (i) it is faster (ii) it checks that the second laundry was a no-op (and did not rewrite unnecessarily). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: merge: test suite: test avoiding re-merge of debian/Ian Jackson2018-08-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: merge: test suite: Do a bit more testingIan Jackson2018-08-11
| | | | | | We can now call t-gdr-good laundered, because it works. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: lib-gdr: t-gdr-good: Handle MergedBreakwatersIan Jackson2018-08-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: lib-gdr: t-gdr-good: Introduce t-gdr-analyseIan Jackson2018-08-11
| | | | | | | | NFC This will allow us to recurse. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: lib-gdr: t-gdr-good: Introduce $analIan Jackson2018-08-11
| | | | | | NFC Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: merge: Comment about laundry of merge of unstitchedIan Jackson2018-08-11
| | | | | | | | I have concluded that this is not a problem avoidable by git-debrebase, and that any trouble will be tolerable (at least, not data loss). The user should try to avoid doing this. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: merge: test suite: Test both with and without `after'Ian Jackson2018-08-11
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: New gdr-merge testIan Jackson2018-08-11
| | | | | | | | This still has a lot of xxx's, but as it is right now it passes, despite all the bugs. This seems like a reasonable baseline for more work. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: New merge handing, experimental and preliminaryIan Jackson2018-08-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Classification: * Classify octopus merges as unknown, separately * Classify 2-parent general merges as VanillaMerge, if feature enabled * Introduce new merged-breakwater commit tag, classify as MergedBreakwaters * Classify other gdr-generated 2-parent merges as unknown Inspection (keycommits): * VanillaMerge commits require laundry, much like dgit imports, and prevent discernment of the actual breakwater and anchor Laundry (walk): * Rewrite VanillaMerge using new merge_series function Test suite: * We get a slightly different error message in gdr-unprocessable, now. Later, when we make this non-experimental all the time, we are going to have to soup up gdr-unprocessable to make a worse test commit. There are a lot of known bugs and infelicites, marked with "xxx". There is a test (which will appear in a moment) but it's rather a poor test, so there will be many uknown bugs. So all of this is enabled only if GIT_DEBREBASE_EXPERIMENTAL_MERGE is set in the environment. (Strictly, only the classification is gated, but that is sufficient.) No significant functional change without this setting. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gitattributes: Change a comment from xxx to todoIan Jackson2018-08-10
| | | | | | This is not so critical. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: lib-gdr: Break out t-gdr-prep-new-upstreamIan Jackson2018-08-10
| | | | | | | This does not include `git tag' for the upstream, because gdr-newupstream wants to test the case where the tag is missing. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: t-some-changes: Allow control of which files are editedIan Jackson2018-08-10
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Fix gdr's calls to dgit when run formally in autopkgtest.Ian Jackson2018-08-05
| | | | | | | | We should not pass `--dgit='. That causes gdr to try to exec "". Affects gdr-import-dgitview. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gdr-subcommands: Drop obsolete lineIan Jackson2018-08-04
| | | | | | | We have done this another way and there will never be a push-hook like this. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gdr-subcommands: Test scrapIan Jackson2018-08-04
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gdr-viagit: Test scrapIan Jackson2018-08-04
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gdr-import-dgitview: Actually test convert-from-dgitviewIan Jackson2018-08-04
| | | | | | This was always my intention with this test, of course. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Support --dgit option for finding dgitIan Jackson2018-08-04
| | | | | | Nothing uses this yet. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gdr-import-dgitview: New test for dgit dsc importsIan Jackson2018-08-04
| | | | | | So far this just tests the bugfixes I've just done. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: editing a test script overrides DGIT_TESTS_PROGRESSIVE.Ian Jackson2018-08-03
| | | | | | By making the script a dependency of the .ok stamp file. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Add t-tstunt-parsechangelog to many gdr tests.Ian Jackson2018-08-03
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite; convert-from-gbp: test not identical in upstream filesIan Jackson2018-07-31
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gdr-unprocessable: new testIan Jackson2018-07-31
| | | | | | Test git-debrebase messages about unprocessable commits. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: gdr-convert-gbp: Provide some unprocessable branchesIan Jackson2018-07-31
| | | | | | We'll add a test which uses these, in a moment. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Test dgit import-dsc --build-products-dir.Ian Jackson2018-07-29
| | | | | | | Add t-buildproductsdir-config to import-nonnative, which will do as a test I think. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: lib-import-chk: Honour $bpdIan Jackson2018-07-29
| | | | | | No functional change because none of the import tests set this. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: add stubbed test for pbuilder subcommandSean Whitton2018-07-28
| | | | | | | pbuilder requires root, but we want to be able to test the subcommand outside of autopkgtest too. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* test suite: add t-pushed-good-check-changesSean Whitton2018-07-28
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* test suite: add t-push-includedSean Whitton2018-07-28
| | | | Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
* test suite: Add t-buildproductsdir-config to some sbuild testsIan Jackson2018-07-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Add a couple of t-buildproductsdir-configIan Jackson2018-07-26
| | | | | | | | Add t-buildproductsdir-config to all build-modes tests and to push-source. This will probably catch almost all of the ../ bugs (#863582). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Use $bpd in several places where it is neededIan Jackson2018-07-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Provide a gbp.conf which sets --export-dir to $bpdIan Jackson2018-07-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite: Introduce $bpd variable (nfc)Ian Jackson2018-07-26
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* test suite lib: add t-buildproductsdir-configSean Whitton2018-07-26
| | | | | | | No users yet so NFC. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 13:58:58 +0000