Commit graph

563 commits

Author SHA1 Message Date
Shaun Ruffell
85c5655f79 Replace 'ѕ' with 's' in test docstrings
Since the recent switch to python3, I've been noticing that some of the tests
have been aborting with the following error when I use LANG=en_US instead of
LANG=en_US.UTF-8:

UnicodeEncodeError: 'latin-1' codec can't encode character '\u0455' in position 57: ordinal not in range(256)

Arguably, I should run with a unicode locale while running the test, but it
*looks* to me like the original ѕ was not intended.
2020-01-26 22:38:52 +01:00
Shaun Ruffell
6852fd2924 test/problems: Report when tests do not run properly
When some of the individual tests fail to run, the `make test` target would
still pass since test/problems would not return an error which could hide the
fact that there are problems in the test.

With this change, if you do not have the python dateutil package, you will now
get output like:

  'test_totals.t' failed to run any tests.
  Passed:                           975
  Failed:                             1
  Unexpected successes:               0
  Skipped:                            0
  Expected failures:                  0
  Runtime:                         4.83 seconds

Or, if you do not have UTF-8 encoding set in your language you will get
something like:

  'track.t' failed to run all tests.
  'stop.t' failed to run all tests.
  'start.t' failed to run all tests.
  'test_totals.t' failed to run all tests.
  Passed:                           941
  Failed:                            50
  Unexpected successes:               0
  Skipped:                            0
  Expected failures:                  0
  Runtime:                         4.55 seconds
2020-01-26 22:38:52 +01:00
Shaun Ruffell
d62fc02649 test/problems: Change to allow match to be saved after each condition
This isn't a functional change, but will allow the capture groups to be
inspected for each of the regular expressions in a future commit.
2020-01-26 22:38:52 +01:00
Shaun Ruffell
f45734efe0 test:modify.t: Split tests to for synthetic / non-synthetic intervals
Split the single test for synthetic interval into two separate tests.
2020-01-26 19:49:23 +01:00
Shaun Ruffell
845ab2f805 test: Check move / annotate commands with both synthetic and non-synthetic intervals in database
These tests are designed to check that `getIntervalsById()` will not
count the open interval at the end of the database twice.

See https://github.com/GothenburgBitFactory/timewarrior/pull/269/files#r368238522
2020-01-26 19:49:23 +01:00
Shaun Ruffell
7b438830e2 test: Revert recent annotate.t and move.t changes
In commits 18559df275 and eaed297964 I had updated existing
tests when I should have created new tests to check mixed synethic /
non-synethic intervals.

This change reverts those changes and a follow-on commit will add the
new tests.

See https://github.com/GothenburgBitFactory/timewarrior/pull/269/files#r368238522
2020-01-26 19:49:23 +01:00
Shaun Ruffell
d9480b591a CmdModify: Allow modification of synthetic intervals
This fixes an issue in the modify command since it was first added. This will
allow modify to work in the presence of synthetic intervals.
2020-01-17 17:48:57 +01:00
Shaun Ruffell
18559df275 test/move.t: Make sure move handles mix of synthetic and non-synthetic intervals
This test updates one of the existing tests to make sure that an non-synthetic
interval in addition with the synthetic intervals can be moved properly.
2020-01-17 17:48:57 +01:00
Shaun Ruffell
eaed297964 test/annotate.t: Annotate a mix of synthetic / non-synthetic intervals 2020-01-17 17:48:57 +01:00
Shaun Ruffell
ff56bc4759 test/simpletap: Look for functions that start with "test_" on exceptions
Since the switch to python3, there is another method that starts with "test"
higher up in the stack which produces unhelpful file / line information on a
failed test like:

  ERROR: CommandError on file /usr/lib/python3.6/unittest/case.py line 59 in testPartExecutor: 'yield':

This change restores the previous behavior from before the switch to python 3.
2020-01-17 17:48:57 +01:00
Shaun Ruffell
0e354da1c7 test: Use faketime instead of date -v for relative dates
Ubuntu 18.04.3 does not have the -v option to the date utility.
2020-01-17 17:48:57 +01:00
Thomas Lauf
5e385b84a1 Switch to python 3
- #259

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-12-28 19:01:26 +01:00
Thomas Lauf
ddf713a722 Switch to python 3
- #259

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-12-27 19:08:57 +01:00
Thomas Lauf
13a8edc7ef Resharpen test stop with id should suggest modify command
- Amends #270

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-12-27 16:10:28 +01:00
Shaun Ruffell
145af6603c Stop with id should suggest modify command
Recently I was trying to stop an interval that I had left open over the
weekend, but I had already started a new interval at the beginning of the
week. The error I was received was "The end of a date range must be after the
start." which was confusing to me.

After a few moments I realized I should have been using the modify command.
Now the stop command will suggest modify if someone attempts to use stop for
this purpose.
2019-12-27 15:47:39 +01:00
Thomas Lauf
80fe5e4221 Use pyenv to run tests with python3
- #259

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-12-22 13:09:19 +01:00
Thomas Lauf
eccf82ff56 Print version information at end
Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-12-21 22:55:02 +01:00
Thomas Lauf
6ecdbc5cf7 Remove unneeded packages
Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-12-21 22:53:59 +01:00
Thomas Lauf
c6fb6c4e3a Fix installation of python3-dateutil
Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-12-21 22:53:10 +01:00
Thomas Lauf
6637452a1f Cleanup Dockerfiles
Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-12-21 22:32:56 +01:00
Thomas Lauf
5c1e037abc Persist activation of scl package
Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-12-21 22:32:55 +01:00
Thomas Lauf
8189652bbc Print version information at end
Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-12-21 22:32:46 +01:00
Thomas Lauf
800062ace2 Consolidate package list
- Remove unnecessary packages
- Sort packages alphabetically

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-12-21 22:32:36 +01:00
Thomas Lauf
660816ae5f Put packages on separate lines for better readability
Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-12-21 22:32:25 +01:00
Thomas Lauf
28a3db5579 Switch to python 3
- #259

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-12-21 22:31:05 +01:00
Thomas Lauf
38ddb4ee5b Remove line break
Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-12-11 10:20:33 +01:00
Thomas Lauf
09a77eddb3 Mark byte literals
- #259

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-12-11 10:20:33 +01:00
Thomas Lauf
c27344525b Remove compat.py
- There is only one string type in python3
- #259

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-12-11 10:20:33 +01:00
Thomas Lauf
c7e044373f Replace assertItemsEqual with assertSequenceEqual
- Add sorting for both lists
- #259

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-12-11 10:20:33 +01:00
Thomas Lauf
34a152c794 Replace assertRegexpMatches with assertRegex
- #259

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-12-11 10:20:33 +01:00
Thomas Lauf
9dd8257cc0 Replace assertEquals with assertEqual
- #259

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-12-11 10:20:33 +01:00
Thomas Lauf
7fa7ca5f04 Remove vim annotations
Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-12-11 10:20:33 +01:00
Thomas Lauf
f53e1cef6d Switch to python 3
- #259

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-12-11 10:20:32 +01:00
Thomas Lauf
2f6d12fc9e Add performance tests
Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-12-06 16:29:40 +01:00
Thomas Lauf
05a418592b Add test environment for macOS 10.14
- Small tweaks in test script

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-11-23 22:02:09 +01:00
Shaun Ruffell
a021e8402f Ignore stderr output in TestHelp.test_help_with_command_should_show_man_page 2019-11-19 19:45:18 +01:00
Shaun Ruffell
f0bda68b02 Allow help.t test to find manpages without installing them. 2019-11-19 19:45:18 +01:00
Shaun Ruffell
8109c155af #220: Handle escaped quotes in tags database file.
If there are escaped quotes in the tags database file, when the file is read,
then written, additional escape characters were inserted.

For example:

When tag 'a "test"' is written, it gets stored as 'a \"test\"'. Then it's read
back in that form, but the next time it's serialized to disk, the quotes would
be escaped again resulting in 'a \\"test\\"' which has the effect of removing
the escapes for the double-quotes.
2019-11-18 06:43:21 +01:00
Shaun Ruffell
5f5cfb7b0f #254: quotes in annotations are not escaped
Escapes the quotes for the annotations in the data file, and when
converting an interval to JSON.

The quotes in the annotations were already dequoted in
IntervalFactory::fromSerialization, so we only needed to quote the strings
when serializing or dumping to JSON.
2019-11-18 06:43:21 +01:00
Thomas Lauf
1d8b2aa042 Fix gentoo setup
- Change path for portage to /var/db/repos/gentoo
- Replace sys-apps/man with sys-apps/man-db

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-11-17 22:18:49 +01:00
Thomas Lauf
45672e05f3 Add options --hours and --minutes to inject a range
Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-11-12 16:32:15 +01:00
Thomas Lauf
ad926480dd Check exit code directly
- See https://github.com/koalaman/shellcheck/wiki/SC2181

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-11-12 16:31:23 +01:00
Thomas Lauf
e15fcd30d0 Update copyright holders
Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-10-18 10:59:16 +02:00
Thomas Lauf
d64017a7a6 Update copyright dates
Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-10-18 10:59:16 +02:00
Michael Eischer
8053ccf68e Fix calculation of totals longer than a day
datetime.timedelta stores days, seconds and microseconds. Therefore the
seconds attribute only stores timedeltas of less than 24 hours. Use
total_seconds() instead which properly accounts for the days part.
2019-10-18 10:56:50 +02:00
Thomas Lauf
629a3ffe58 Run tests from parent directory
- somehow cpp-testfiles are not compiled when calling make in the test directory
- make install is required to be executed before make test, because we need access to man pages (help.t)

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-09-06 16:11:29 +02:00
Thomas Lauf
cf41d2f80c Set repository location back to /usr/portage
Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-08-27 09:38:30 +02:00
Thomas Lauf
26716679ef Set gentoo portage location to /var/db/repos/gentoo
- See https://github.com/gentoo/gentoo-docker-images/issues/69

Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-08-27 09:33:21 +02:00
Thomas Lauf
529e6905ca Use external image as stage
Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-08-26 23:46:58 +02:00
Thomas Lauf
c33de03a9a Remove debug statements
Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
2019-08-26 23:15:05 +02:00