155d419b8b
Merge remote-tracking branch 'myk002/myk_quickfix' into develop
2021-04-18 23:41:21 -04:00
a76c89f198
fix quickfortress stockpiles
2021-04-17 14:14:35 -07:00
c4c9559b39
Make test failure stack traces include all frames from the test file
2021-04-17 13:55:43 -04:00
f414c5b217
Merge branch 'test-mocks' into develop
2021-04-17 13:44:49 -04:00
403f822520
Add tests for patch() where patching raises an error
2021-04-17 00:59:56 -04:00
e8fb29d908
Auto-update submodules
...
scripts: master
2021-04-16 07:07:05 +00:00
ee8e10429d
Add initial implementation of mock.restore()
...
Like mock.patch() but only restores original values instead of also setting
new values initially.
2021-04-16 00:34:46 -04:00
a2f6bab0e6
Update scripts, authors
...
Ref dfhack/scripts#267
2021-04-15 22:29:53 -04:00
e4de302048
Simplify building overlap calculations significantly
...
Fixes #1824
2021-04-14 00:59:43 -04:00
792bf14921
Auto-update submodules
...
library/xml: master
2021-04-13 07:08:38 +00:00
ed192a3712
Update scripts
2021-04-12 00:48:40 -04:00
909efe71a0
Add stack traces to test error messages
...
Also reorder for consistency with "test failed:" messages, which are at the end
of a test's output.
2021-04-12 00:48:10 -04:00
855ab1a0a3
Merge remote-tracking branch 'lethosor/test-mocks' into develop
2021-04-10 16:12:33 -04:00
757736728d
Add a mock.func() helper for mocking functions
2021-04-10 01:22:03 -04:00
846cf9a8ff
Auto-update submodules
...
scripts: master
2021-04-09 07:08:20 +00:00
f44442e5e9
Use mock.patch() in ci/test.lua
...
Other tests that could benefit are currently only in the scripts repo.
2021-04-09 00:50:11 -04:00
5424392273
mock.patch(): propagate return values
2021-04-09 00:41:39 -04:00
f25b8a0d14
Fix patching value with nil
2021-04-09 00:35:54 -04:00
7b2f01d45b
Add initial mock.patch() implementation for tests
2021-04-09 00:32:10 -04:00
e2d56b9b8f
Merge remote-tracking branch 'lethosor/tweak-hide-priority-improvements' into develop
2021-04-08 23:43:14 -04:00
781dff7144
Merge remote-tracking branch 'myk002/myk_kdevelop_cmake' into develop
2021-04-08 23:42:25 -04:00
70b85631aa
Merge remote-tracking branch 'myk002/myk_run_script_wrap' into develop
2021-04-08 23:35:16 -04:00
172821af17
Auto-update submodules
...
library/xml: master
scripts: master
2021-04-07 07:07:27 +00:00
449fa42906
ignore build/.cmake cache created by kdevelop
2021-04-06 11:47:52 -07:00
12315fc5dd
wrap dfhack.run_script for tests
...
so dfhack.internal.scripts isn't polluted with IN_TEST envs
2021-04-06 11:33:49 -07:00
106fa4a5cf
Merge remote-tracking branch 'myk002/myk_printerr_match' into develop
2021-04-06 00:39:16 -04:00
7b1d7a7ff9
Fix off-by-one error in report-usage
2021-04-05 23:35:11 -04:00
14172b7c0f
Improve readability of report-usage output
2021-04-05 23:33:53 -04:00
40c2b19083
Switch from vector to unordered_set
2021-04-05 23:28:42 -04:00
1c3e60337c
Switch to range-based for
2021-04-05 23:23:31 -04:00
761cf19e99
tweak hide-priority: make toggle state persist across designation menu uses
...
To reproduce:
1. Enter the `d`esignation menu
2. Press `-+` to change priorities
3. Create a designation
4. Press `Alt-p` to hide priorities
5. Exit and re-enter the designation menu (`Esc`, `d`)
Previously, priorities would be visible again after step 5. With this change, they are not visible until you press `Alt-p` again.
Fixes #1068 . Note that this is a relatively unobtrusive fix: selecting a priority with `+-` will still result in priorities being shown again. This is native DF behavior that I am reluctant to override because users of designation priorities likely want to see them.
2021-04-05 21:58:51 -04:00
642d8cbe4b
handle nil values sent to printerr
2021-04-05 01:37:43 -07:00
a5128fd7e6
dwarfvet: minor logic cleanup
...
- Use at() to crash immediately on out-of-range errors instead of introducing
memory corruption (see #1824 )
- Replace custom implementation of df::unit::find()
- Use range-based for with get_vector() where appropriate
2021-04-05 00:38:23 -04:00
81bfdf4182
update changelog
2021-04-04 17:40:59 -07:00
13ca7f8c9e
move expect.lua from internal/ to test_util/
2021-04-04 17:37:37 -07:00
c8abecd082
detect dfhack.printerr usage at the test level
...
not the expect level. this allows us to properly nest expect calls
inside of expect.printerr_match() as originally intended.
2021-04-04 17:37:36 -07:00
5af1b627cb
add tests, move expect.lua
...
I moved expect.lua from library/lua/test/ to library/lua/internal since
luacov is configured to ignore any file with /test/ in its path
2021-04-04 17:37:36 -07:00
757dbeb238
update existing calls to expect.error* to new API
2021-04-04 17:37:36 -07:00
a6561911c1
error on unmatched printerr output during a test
...
- provides expect,printerr_match for matching printerr output
- fails tests if printerr is called outside the printerr_match wrapper
- changes api of expect.error_match to mirror the new printerr_match api
2021-04-04 17:37:33 -07:00
9d723dc256
Switch to DFHack luacov fork
...
Fixes behavior of `push.recurseSubmodules`: since the commit we track is
currently only a tag (v0.15.0), pushing with `recurseSubmodules = check` fails
since that checks that submodule commits are on a branch. In our own fork, we
can add a `dfhack` branch that resolves this issue, which is consistent with
other dependencies.
2021-04-03 18:12:09 -04:00
ea1bc9e01b
Add GitHub issues/discussions to troubleshooting section
2021-04-03 00:24:58 -04:00
8b38bf0e28
Move contribution-related information from Compile.rst to Contributing.rst
2021-04-03 00:20:15 -04:00
cb2d8e0903
Compile.rst: remove old git note and rearrange
...
Very unlikely that this affects anyone now
2021-04-02 23:52:32 -04:00
dfb52a2aba
Merge remote-tracking branch 'lethosor/command-prompt-fix-gui-scripts' into develop
...
Conflicts:
docs/changelog.txt
2021-04-02 21:53:14 -04:00
81905fa8fc
Merge remote-tracking branch 'lethosor/fix-buildingplan-construction-sizing' into develop
2021-04-01 22:01:50 -04:00
257f8dbe00
buildingplan: fix size calculation for constructions
...
Planning a 4x2 construction with DF's `umkh` keys (i.e. not automaterial's box-select) would previously produce a 5x3 construction instead, for example.
2021-04-01 00:16:54 -04:00
8129fdab4e
Merge remote-tracking branch 'myk002/myk_invalidate_scripts' into develop
2021-03-31 00:50:31 -04:00
c06d1f8e52
tagged union support for lua ( #1818 )
2021-03-30 15:55:06 -05:00
5e7653bbf5
Don't run update-submodules job in forks
2021-03-29 20:03:50 -04:00
4e844f39ae
undo formatting change in script_environment
2021-03-29 12:29:15 -07:00
lethosor
myk002
DFHack-Urist via GitHub Actions
Ben Lubar