diff options
| author | James Booth <boothj5@gmail.com> | 2015-06-13 23:59:33 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-06-13 23:59:33 +0100 |
| commit | e50461a897d225a60b08e928074753230fc4ede6 (patch) | |
| tree | 33dd743b1210740c6e9f25d16e1e575a7ecb485d /tests/functionaltests | |
| parent | 82ff85c329dca6105bfa9add9cb1424ecc2ae334 (diff) | |
| download | profani-tty-e50461a897d225a60b08e928074753230fc4ede6.tar.gz | |
Set columns when running functional tests
Diffstat (limited to 'tests/functionaltests')
| -rw-r--r-- | tests/functionaltests/proftest.c | 27 | ||||
| -rwxr-xr-x | tests/functionaltests/start_profanity.sh | 2 |
2 files changed, 20 insertions, 9 deletions
diff --git a/tests/functionaltests/proftest.c b/tests/functionaltests/proftest.c index 78a82c11..613c2c7a 100644 --- a/tests/functionaltests/proftest.c +++ b/tests/functionaltests/proftest.c @@ -123,12 +123,16 @@ _cleanup_dirs(void) void prof_start(void) { - fd = exp_spawnl("./profanity", "./profanity", "-l", "DEBUG", NULL); + // helper script sets terminal columns, avoids assertions failing + // based on the test runner terminal size + fd = exp_spawnl("sh", + "sh", + "-c", + "./tests/functionaltests/start_profanity.sh", + NULL); FILE *fp = fdopen(fd, "r+"); - if (fp == NULL) { - assert_true(FALSE); - } + assert_true(fp != NULL); setbuf(fp, (char *)0); } @@ -155,15 +159,20 @@ init_prof_test(void **state) _create_logs_dir(); prof_start(); - prof_output_exact("Profanity"); + assert_true(prof_output_exact("Profanity")); + // set UI options to make expect assertions faster and more reliable prof_input("/inpblock timeout 5"); - prof_output_exact("Input blocking set to 5 milliseconds"); + assert_true(prof_output_exact("Input blocking set to 5 milliseconds")); prof_input("/inpblock dynamic off"); - prof_output_exact("Dynamic input blocking disabled"); - + assert_true(prof_output_exact("Dynamic input blocking disabled")); prof_input("/notify message off"); - prof_output_exact("Message notifications disabled"); + assert_true(prof_output_exact("Message notifications disabled")); + prof_input("/wrap off"); + assert_true(prof_output_exact("Word wrap disabled")); + prof_input("/roster hide"); + assert_true(prof_output_exact("Roster disabled")); + prof_input("/time off"); } void diff --git a/tests/functionaltests/start_profanity.sh b/tests/functionaltests/start_profanity.sh new file mode 100755 index 00000000..58ceadd7 --- /dev/null +++ b/tests/functionaltests/start_profanity.sh @@ -0,0 +1,2 @@ +export COLUMNS=300 +./profanity -l DEBUG |