770 Commits

Author SHA1 Message Date
Niels Thykier
6f24be9954 britney.py: Refactor doop_source
Rename local variables and avoid repeated chained lookups.  In
particular, avoid confusing cases like:

   [...]
         version = binaries[parch][0][binary][VERSION]

   [...]
   binaries[parch][0][binary] = self.binaries[item.suite][parch][0][binary]
   version = binaries[parch][0][binary][VERSION]

Where "version" here will refer to two different versions.  The former
the version from testing of a hijacked binary and the latter the
version from the source suite (despite the look up using the "testing"
table, due to the testing copy being updated).

Notable renamings:
 * binaries => packages_t (a.k.a. self.binaries['testing'])
 * binaries[parch][0] => binaries_t_a
 * binaries[parch][1] => provides_t_a
 * Similar naming used for "item.suite" instead of "testing"

The naming is based on the following logic:
 * self.binaries from "packages" files
   (by this logic, it ought to be "self.packages", but that is
   for later)
 * The "_X_a" is short for "[<suite>][<parch>]" look ups.
 * binaries_X_a and provides_X_a are the specialised parts of
   packages_X_a that deal with (real) binary packages and
   provides (i.e. virtual packages) respectively.

Signed-off-by: Niels Thykier <niels@thykier.net>
2014-08-04 20:20:16 +02:00
Niels Thykier
d5384f03ff inst-tester: Attempt to avoid needing to backtrack
When trying to break a choice, try the candidate out and see if we can
pick it without any consequences.  Basically, if the candidate causes
no new conflicts or choices, we can safely pick it.

Signed-off-by: Niels Thykier <niels@thykier.net>
2014-08-04 20:20:16 +02:00
Niels Thykier
b68b77f73e inst-tester: Exploit eqv. table in compute_testing_installability
Use the equvilence table to skip some calls to _check_inst.

Signed-off-by: Niels Thykier <niels@thykier.net>
2014-08-04 20:20:16 +02:00
Niels Thykier
e2ac08c62e installability: Exploit equvialency to reduce choices
For some cases, like aspell-dictionary, a number of packages can
satisfy the dependency (e.g. all aspell-*).  In the particular
example, most (all?) of the aspell-* look so similar to the extent
that reverse dependencies cannot tell two aspell-* packages apart (IRT
to installability and co-installability).

This patch attempts to help the installability tester by detecting
such cases and reducing the number of candidates for a given choice.

Reported-In: <20140716134823.GA11795@x230-buxy.home.ouaza.com>
Signed-off-by: Niels Thykier <niels@thykier.net>
2014-08-04 20:20:03 +02:00
Niels Thykier
33049b2b1c doop_source: Remove unncessary table loop up
Signed-off-by: Niels Thykier <niels@thykier.net>
2014-08-04 20:20:02 +02:00
Niels Thykier
4fd740dd8b doop_source: Remove redundant part of the return value
Signed-off-by: Niels Thykier <niels@thykier.net>
2014-08-04 20:20:02 +02:00
Niels Thykier
faa3f450e1 britney.py: Split iter_packages into two
Extract a specialised iter_packages_hint from iter_packages that only
deals with applying hints.  This simplifies iter_packages AND avoids
having to re-compute the uninstallability counters after each single
item in the hint.

This means that a hint can now avoid triggering expontential runtime
provided only that the "post-hint" stage does not trigger expontential
runtime.  Previously the hint had to be ordered such that none of the
items in the hint caused such behaviour (if at all possible).

Signed-off-by: Niels Thykier <niels@thykier.net>
2014-08-04 20:20:02 +02:00
Niels Thykier
6a19e254de britney.py: Handle version-ranged dependencies a bit smarter
Avoid creating two dependency clauses for dependencies emulating a
"version range" a la:

  Depends: pkg-a (>= 2), pkg-a (<< 3~)

Previously this would create two clauses a la:

 - (pkg-a, 2, arch), (pkg-a, 3, arch)
 - (pkg-a, 1, arch), (pkg-a, 2, arch)

However, it is plain to see that only (pkg-a, 2, arch) is a valid
solution and the other options are just noise.  This patch makes
Britney merge these two claues into a single clause containing exactly
(pkg-a, 2, arch).

Signed-off-by: Niels Thykier <niels@thykier.net>
2014-08-04 20:19:49 +02:00
Colin Watson
52ad167312 Fix substitution ordering mistake in out-of-date rendering. 2014-07-25 12:37:16 +01:00
Colin Watson
0a4f948e3a Allow Dates to be absent. 2014-07-24 17:35:47 +01:00
Colin Watson
0a2b1fd4b0 Add a --distribution option; parameterise most mentions of "ubuntu" using it. 2014-07-24 15:28:12 +01:00
Colin Watson
f7b4cbc5cb Drop --ubuntu-series alias option now that britney1 no longer uses it. 2014-07-24 15:20:09 +01:00
Colin Watson
d0d4ea5fa8 Rename --ubuntu-series option to just --series. 2014-07-24 15:18:26 +01:00
Niels Thykier
3817e9bae8 inst/builder.py: Move a comment and write doc for method
Signed-off-by: Niels Thykier <niels@thykier.net>
2014-07-19 09:51:36 +02:00
Niels Thykier
5e7417f416 britney.py: _compute_groups returns sets of tuples, not str
Fix a call site to use a tuple instead of a str when testing if a
package has been smooth-updated.

Signed-off-by: Niels Thykier <niels@thykier.net>
2014-07-13 10:01:14 +02:00
Niels Thykier
ad84f50d1b britney.py: dict does not have a .add (in _compute_groups)
Signed-off-by: Niels Thykier <niels@thykier.net>
2014-07-13 10:01:14 +02:00
Colin Watson
9dbef8c864 Adjust maybe-NBS check again, this time to check for newer versions of other binaries from the same source. 2014-07-10 09:22:40 +01:00
Colin Watson
f81e685f99 Fix out-of-date maximum version check to only check binaries, not sources. 2014-07-08 17:34:35 +01:00
Colin Watson
02e9779d35 Only flag an out-of-date package as possible NBS if the out-of-date version is also the maximum version across all architectures. 2014-07-08 15:12:22 +01:00
Colin Watson
18edacf8b2 Show a note for out-of-date binaries from a version between the one in testing and the one in unstable, since those are usually NBS and this makes such cases more searchable. 2014-07-08 14:32:22 +01:00
Niels Thykier
9b24a1d4e7 britney.py: Fix use of undefined variable
A currently dead branch in _compute_group uses an undefined local
variable.

Signed-off-by: Niels Thykier <niels@thykier.net>
2014-06-15 21:57:24 +02:00
Adam D. Barratt
28389f730e Remove an obsolete comment
The C library is no longer used so stop suggesting changing it when
there are issues.

Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
2014-06-15 17:18:25 +00:00
Niels Thykier
34d1a6c653 Solver: Add more (optional) debugging output
Signed-off-by: Niels Thykier <niels@thykier.net>
2014-06-15 18:20:23 +02:00
Niels Thykier
8d4753530c Britney: Fix malformed removal hints from auto hinter
Signed-off-by: Niels Thykier <niels@thykier.net>
2014-06-15 18:20:22 +02:00
Niels Thykier
271fb11b33 britney.py: Fix bug with hinting removals
Fix a bug in the auto hinter that could make think that sources had
already been removed.

Signed-off-by: Niels Thykier <niels@thykier.net>
2014-06-15 16:56:17 +02:00
Niels Thykier
c0409c1b04 Add auto hinter on top of the new installability tester
The "new" auto hinter relies on partial ordering to determine, when
what can migrate (and what needs to migrate at the same time).  At the
same time, it leverages on "_compute_groups" to allow it to include
"removals" in its hints.

Signed-off-by: Niels Thykier <niels@thykier.net>
2014-06-08 17:51:50 +02:00
Niels Thykier
ebc9af70fa Handle smooth updates better in "easy"-hints
Avoid smooth-updating libraries in hints, when all of their reverse
dependencies will certainly disappear in the same hint.

Note that in "hint"-hint, reverse dependencies removed in the
following "full run" will not cause the smooth-updated library to be
removed.  Instead these will still be removed in the end as usual, but
in some cases that is too late.

Signed-off-by: Niels Thykier <niels@thykier.net>
2014-06-08 17:44:44 +02:00
Niels Thykier
580f4a7f3d Rewrite, rename and extend find_upgraded_binaries
Rename find_upgraded_binaries into _compute_groups.  The new method
will also compute what binaries will be updated in or added to testing
after migration.

Signed-off-by: Niels Thykier <niels@thykier.net>
2014-06-08 17:05:23 +02:00
Colin Watson
3aab217f6c Make sure that containing directories exist before writing output files. 2014-06-06 14:45:55 +01:00
Colin Watson
e38a4842d6 Make all output files series-specific, and remove dependency on "testing" and "unstable" symlinks. 2014-06-06 13:22:26 +01:00
Colin Watson
6ac23e6d67 Add new --ubuntu-series option, replacing ADT_SERIES in the configuration file. Add ADT_ENABLE configuration file entry to allow disabling autopkgtests (previously done by setting ADT_SERIES to the empty string). 2014-06-05 11:42:14 +01:00
Julien Cristau
614ab74eb5 Add pochu
Signed-off-by: Julien Cristau <jcristau@debian.org>
2014-05-24 16:59:17 +02:00
Colin Watson
a6fbf59cbc merge lp:~jibel/britney/fix_missing_results 2014-05-12 15:40:45 +01:00
Jean-Baptiste Lallement
890b82aaef Merged trunk 2014-05-12 15:01:36 +02:00
Colin Watson
b3f45e59d7 merge lp:~canonical-platform-qa/britney/tests 2014-05-12 13:44:52 +01:00
Martin Pitt
9b4eeafef2 Mark test_result_from_older_version as XFAIL 2014-05-12 14:04:55 +02:00
Jean-Baptiste Lallement
2a3a8cb657 autopkgtest.py: Document method read() and code simplification
britney.py: code simplification
2014-05-12 11:47:40 +02:00
Jean-Baptiste Lallement
1052dea946 * tests/test_autopkgtest.py:
- Added docstrings
- Replaced format by %
- Import ADT_EXCUSES_LABELS from autopkgtest.py instead of redefining it
- Renamed test to avoid name conflict with autopkgtest.py from britney
- Fixed some formatting
2014-05-12 11:12:24 +02:00
Jean-Baptiste Lallement
4382d5c1e0 tests/autopkgtest.py: Removed debugging code 2014-05-06 16:55:57 +02:00
Jean-Baptiste Lallement
d490ca6a87 tests/autopkgtest.py: Added new tests when results already exist in history 2014-05-06 16:55:16 +02:00
Jean-Baptiste Lallement
1f09f02570 tests/autopkgtest.py: Use the right key for sorting history 2014-05-06 09:10:53 +02:00
Jean-Baptiste Lallement
a190cedd55 tests/autopkgtest.py: shell test with history 2014-05-05 18:19:48 +02:00
Jean-Baptiste Lallement
acd4de7868 tests/autopkgtest.py: Fixed testsuite and added tests to match new labels and rules for regression/always failing tests 2014-05-05 18:08:40 +02:00
Jean-Baptiste Lallement
7e80d47eb6 autopkgtest.py:
- A test for a package/version can be triggered by several distincts causes with different results. Modify the data structure to store this instead of only storing the last cause and result, leading to missing test results in excuses.
- Check if failures are regressions (there is at least one pass and migration is blocked) or if test has always been failing. In the latter case, migration is not blocked.
- Add colours to excuses.html to distinguishes the test results
- Point jenkins URL to lastBuild
2014-04-29 23:38:45 +02:00
Jean-Baptiste Lallement
3948558ac2 merged trunk 2014-04-28 10:04:55 +02:00
Philipp Kern
a75002f472 britney{,_nobreakall.conf}: Drop sparc from testing.
Signed-off-by: Philipp Kern <pkern@debian.org>
2014-04-26 14:59:48 +00:00
Colin Watson
eecb3ba5fa trusty -> utopic 2014-04-23 20:46:40 +01:00
Martin Pitt
0cd14d1394 fix source package name in cause of new_source tests 2014-03-17 09:35:20 +01:00
Martin Pitt
2b7e93515f add test for uninstallable binary built from new source package 2014-03-17 08:43:25 +01:00
Martin Pitt
728bcc92ea merge trunk 2014-03-17 08:34:59 +01:00