chiark / gitweb /
Ian Jackson [Fri, 21 May 2021 19:10:06 +0000 (20:10 +0100)]
apitest: Rework OtterArgsSpec trait slightly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 19:08:03 +0000 (20:08 +0100)]
apitest: Introduce OtterArgsSpec trait
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 18:44:32 +0000 (19:44 +0100)]
apitest: Rename reset_game() to otter_resetting()
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 18:41:17 +0000 (19:41 +0100)]
apitest: Use new ds in a couple of places
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 18:39:52 +0000 (19:39 +0100)]
apitest: Provide UsualCtx::ds
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 18:35:04 +0000 (19:35 +0100)]
bundles: Test reset with bundles
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 18:34:31 +0000 (19:34 +0100)]
apitest: Adjust table width
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 18:31:05 +0000 (19:31 +0100)]
apitest: Break out clear_reset_to_demo
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 18:02:03 +0000 (19:02 +0100)]
bundles: Call updated() when clearing bundles
Oops!
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 17:43:17 +0000 (18:43 +0100)]
bundles: Add a missing Derive
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 17:42:56 +0000 (18:42 +0100)]
bundles: Clear: Do not produce spurious error in log about .d
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 14:16:04 +0000 (15:16 +0100)]
otter(1): Provide --bundles-always
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 13:40:23 +0000 (14:40 +0100)]
test bundle: Add demo-in-test-bundle game spec
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 13:40:03 +0000 (14:40 +0100)]
Makefile: Do not put symlinks in example and test bundles
Instead, follow the links.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 13:35:55 +0000 (14:35 +0100)]
termprogress: Rename Null to remove otiose Reporter
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 13:33:05 +0000 (14:33 +0100)]
otter(1): Suppress a message if --quiet
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 13:32:26 +0000 (14:32 +0100)]
otter(1): Do not do progress bars if --quiet
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 13:27:41 +0000 (14:27 +0100)]
otter(1): reset bundles, do upload
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 13:27:29 +0000 (14:27 +0100)]
termprogress: Provide Nest reporter
For iterating round a phase loop.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Fri, 21 May 2021 13:03:01 +0000 (14:03 +0100)]
otter(1) reset: Bundle scanning: Improve messages and style
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 20 May 2021 11:51:57 +0000 (12:51 +0100)]
otter(1) reset: Bundle uploading: Scan to see if we have to
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 20 May 2021 02:10:30 +0000 (03:10 +0100)]
cmdlistener: Add a command about timeouts and bundle processing
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 20 May 2021 13:23:13 +0000 (14:23 +0100)]
otter(1): Break out BundleForUpload
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 20 May 2021 11:44:56 +0000 (12:44 +0100)]
otter(1): Fix user docs for new CLI, using -g
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 20 May 2021 11:43:38 +0000 (12:43 +0100)]
otter(1): Provide -g abbreviation for --game
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 20 May 2021 11:41:27 +0000 (12:41 +0100)]
otter(1): Change TABLE-NAME to a global option argument
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 20 May 2021 11:06:38 +0000 (12:06 +0100)]
bundles: Display hashes more nicely
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 20 May 2021 11:01:40 +0000 (12:01 +0100)]
bundles: Record and return and display hashes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 20 May 2021 10:26:33 +0000 (11:26 +0100)]
utils: Rename [Index]Vec::get_or_extend_with and soup up
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 20 May 2021 10:22:19 +0000 (11:22 +0100)]
utils: Break out [Index]Vec::ensure_element_with ext traits
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 20 May 2021 02:24:13 +0000 (03:24 +0100)]
bundles: Redo progress phases and enums
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 20 May 2021 02:23:33 +0000 (03:23 +0100)]
progress: Allow impl to have different lifetimes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 20 May 2021 01:52:22 +0000 (02:52 +0100)]
bundles: Box progress so we can pass it to finish_upload
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 20 May 2021 01:03:40 +0000 (02:03 +0100)]
at-bundle: Test uploaded via otter(1)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 20 May 2021 00:50:29 +0000 (01:50 +0100)]
otter(!): When spec is not path, use server's idea of it
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 20 May 2021 00:50:33 +0000 (01:50 +0100)]
otter(!): Break up read_spec (for uploadable specs)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 20 May 2021 00:40:28 +0000 (01:40 +0100)]
specs: Test that loading works, including pieces
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 20 May 2021 00:31:24 +0000 (01:31 +0100)]
bundles: Test finding specs in bundles
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 20 May 2021 00:22:49 +0000 (01:22 +0100)]
Makefile: big-bundle: Add a modified demo spec
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 May 2021 23:24:49 +0000 (00:24 +0100)]
bundles: Implement finding specs in bundles
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 May 2021 23:15:25 +0000 (00:15 +0100)]
bundles: Refactor slightly to make room for specs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Thu, 20 May 2021 00:00:37 +0000 (01:00 +0100)]
specs: Change error handling for load_spec_to_read (again)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 May 2021 23:42:46 +0000 (00:42 +0100)]
specs: Change error handling for load_spec_to_read
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 May 2021 22:20:19 +0000 (23:20 +0100)]
specs: Test ResetFromNamesSpec (adhoc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 May 2021 22:19:49 +0000 (23:19 +0100)]
specs: Support ResetFromNamesSpec
And the associated config.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 May 2021 21:35:17 +0000 (22:35 +0100)]
otter(1): Provide command-{json,ron} for adhoc commands
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 May 2021 22:03:49 +0000 (23:03 +0100)]
otter(1): Move response iteration back into alter_game_adhoc
It turns out that commands want to print responses one at a time.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 May 2021 21:14:48 +0000 (22:14 +0100)]
otter(1): Fix description of alter-game-json
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 May 2021 21:57:30 +0000 (22:57 +0100)]
otter(1): Introduce a type alias
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 May 2021 21:55:45 +0000 (22:55 +0100)]
otter(1): Drop some not-needed lifetime
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 May 2021 21:53:09 +0000 (22:53 +0100)]
otter(1): Break out AdhocFormat
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 May 2021 21:14:52 +0000 (22:14 +0100)]
otter(1): Provide alter-game-ron too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 May 2021 21:24:09 +0000 (22:24 +0100)]
otter(1): Generalise alter-game-json ad-hoc subcommand (2)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 May 2021 21:01:11 +0000 (22:01 +0100)]
otter(1): Generalise alter-game-json ad-hoc subcommand (1)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 May 2021 19:51:15 +0000 (20:51 +0100)]
otter(1): Provide alter-game-json ad-hoc subcommand
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 May 2021 19:51:33 +0000 (20:51 +0100)]
accounts: Require Debug for Perm
This makes debugging a bit easier.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 May 2021 19:51:26 +0000 (20:51 +0100)]
cmdlistener: Fix MGI::Noop to require TestExistence
This saves an assertion failure when it's invoked!
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 May 2021 20:32:17 +0000 (21:32 +0100)]
accounts: Add test for PermSet
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 May 2021 19:52:05 +0000 (20:52 +0100)]
accounts: PermSet: Fix to actually shift (!)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 May 2021 19:16:39 +0000 (20:16 +0100)]
mgmtchannel: Better error from AlterGame failure
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 19 May 2021 19:16:22 +0000 (20:16 +0100)]
apitest: Explode: print the error chain too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 18 May 2021 20:29:29 +0000 (21:29 +0100)]
specs: Pass a spec-obtainer closure to reset_game_from_spec
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 18 May 2021 20:21:59 +0000 (21:21 +0100)]
specs: Parse the spec after accessing the game
We're going to want to get at the game to get the spec from a bundle.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 18 May 2021 20:18:45 +0000 (21:18 +0100)]
specs: Break out reset_game_from_spec
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 18 May 2021 01:29:17 +0000 (02:29 +0100)]
cargo update: Update to latest thirtyfour
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 18 May 2021 01:20:17 +0000 (02:20 +0100)]
cargo update: Update to latest ArrayVec, const generics
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 18 May 2021 19:11:51 +0000 (20:11 +0100)]
bundles: Do not use ArrayVec to unpack a possibly-too-long thing
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 18 May 2021 01:13:37 +0000 (02:13 +0100)]
cargo update; Use Url::Into<String> rather than into_string
The latter is deprecated. Suddenly, meaning the build fails.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 18 May 2021 00:57:36 +0000 (01:57 +0100)]
apitest: Test new big bundle
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 18 May 2021 00:53:07 +0000 (01:53 +0100)]
apitest: bundles: Abstract over bundle name
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 18 May 2021 00:39:05 +0000 (01:39 +0100)]
apitest: Move much bundle processing into main.rs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 18 May 2021 00:35:06 +0000 (01:35 +0100)]
apitest: Test save/load of a bundle
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 18 May 2021 00:34:13 +0000 (01:34 +0100)]
apitest: Break out stop_and_restart_gameserver
This will be for the bundle save/load test.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 18 May 2021 00:27:59 +0000 (01:27 +0100)]
apitest: Delete and reintroduce a lemon
This will be for the bundle save/load test.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 18 May 2021 00:26:40 +0000 (01:26 +0100)]
commands: Move MGI etc. into prelude
apitest wants them. Not sure why this wasn't global before.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 18 May 2021 00:03:31 +0000 (01:03 +0100)]
apitest: Track whether library markers have been added
This lets us run some_library_add a second time. (Although, right
now, the previous add's pieces would still be there.)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 18 May 2021 00:02:38 +0000 (01:02 +0100)]
apitest: Consolidate reset_game and provide in UsualCtx
We are going to want to do some extra tracking
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 May 2021 23:55:45 +0000 (00:55 +0100)]
apitest: Consolidate UsualCtx::prepare_game
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 May 2021 23:45:58 +0000 (00:45 +0100)]
apitest: Fold placing markers into some_library_add
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 May 2021 18:37:54 +0000 (19:37 +0100)]
apitest: check_library_item: Check count of matches
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 May 2021 18:32:10 +0000 (19:32 +0100)]
apitest: Break out check_library_item
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 May 2021 18:23:10 +0000 (19:23 +0100)]
apitest: Move bundles test to at-bundles
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 May 2021 18:22:56 +0000 (19:22 +0100)]
apitest: Make some methods public for reuse
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 May 2021 17:22:50 +0000 (18:22 +0100)]
apitest: at-bundles: Use UsualCtx
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 May 2021 17:19:55 +0000 (18:19 +0100)]
apitest: Move setup code to apitest/main
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 May 2021 17:15:10 +0000 (18:15 +0100)]
apitest: Move a lot of code from at-otter to apitest/main
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 May 2021 17:07:59 +0000 (18:07 +0100)]
apitest: Provide @examples@
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 May 2021 17:05:13 +0000 (18:05 +0100)]
apitest: Prepare for at-bundles
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 May 2021 16:59:01 +0000 (17:59 +0100)]
apitest: Move ok printing to end of main (portmanteau) main
This means it happens for wdt too - fine.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 May 2021 16:54:55 +0000 (17:54 +0100)]
apitest: Un-clone-and-hack api early arg test predicate
At some point I guess we could make this concrete entirely but
this will do for now.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 May 2021 16:52:29 +0000 (17:52 +0100)]
apitest: Make it also a portmanteau
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 May 2021 16:44:51 +0000 (17:44 +0100)]
Makefile: Fix example test bundle building not to produce noise
zip simply ignores missing files, so the dupes were harmless.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 May 2021 16:33:42 +0000 (17:33 +0100)]
apitest: Move portmanteau machinery from wdriver
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 May 2021 16:27:25 +0000 (17:27 +0100)]
Makefile: tidy bundle output
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 May 2021 16:24:19 +0000 (17:24 +0100)]
big-bundle example: Restore renaming of wikipedia
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 May 2021 16:21:13 +0000 (17:21 +0100)]
big-bundle example: Comment out the scraper bits in tomls
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 May 2021 16:13:35 +0000 (17:13 +0100)]
big-bundle example: Use only the bits we want
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 May 2021 16:05:23 +0000 (17:05 +0100)]
media-scraper: Provide LIBRARY_FILE_INPUTS
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 May 2021 15:56:35 +0000 (16:56 +0100)]
progress: Flush so the progress info is actually timely
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 17 May 2021 15:49:01 +0000 (16:49 +0100)]
Makefile: Provide an example big bundle
We mangle the wikimedia files, ad-hoc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
~ianmdlvl / otter.git / log