summaryrefslogtreecommitdiffstats
path: root/qa
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-12-04 03:31:49 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-12-04 03:31:49 +0000
commit23d0ac82f3d68663ddc74a0e1f9b963beb8d62b9 (patch)
treefc37aa2c97a3d28b3dee7f3892041158981ed335 /qa
parentReleasing progress-linux version 0.16.0-1. (diff)
downloadgitlint-23d0ac82f3d68663ddc74a0e1f9b963beb8d62b9.tar.xz
gitlint-23d0ac82f3d68663ddc74a0e1f9b963beb8d62b9.zip
Merging upstream version 0.17.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'qa')
-rw-r--r--qa/requirements.txt2
-rw-r--r--qa/shell.py2
-rw-r--r--qa/test_stdin.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/qa/requirements.txt b/qa/requirements.txt
index 5a4f660..76d6afc 100644
--- a/qa/requirements.txt
+++ b/qa/requirements.txt
@@ -1,4 +1,4 @@
sh==1.14.2
pytest==6.2.5;
-arrow==1.2.0;
+arrow==1.2.1;
gitlint # no version as you want to test the currently installed version
diff --git a/qa/shell.py b/qa/shell.py
index 630843f..06ebfed 100644
--- a/qa/shell.py
+++ b/qa/shell.py
@@ -1,5 +1,5 @@
-# This code is mostly duplicated from the `gitlint.shell` module. We conciously duplicate this code as to not depend
+# This code is mostly duplicated from the `gitlint.shell` module. We consciously duplicate this code as to not depend
# on gitlint internals for our integration testing framework.
import subprocess
diff --git a/qa/test_stdin.py b/qa/test_stdin.py
index c98580e..cee5f0c 100644
--- a/qa/test_stdin.py
+++ b/qa/test_stdin.py
@@ -23,7 +23,7 @@ class StdInTests(BaseTestCase):
self.assertEqualStdout(output, self.get_expected("test_stdin/test_stdin_pipe_1"))
def test_stdin_pipe_empty(self):
- """ Test the scenario where no TTY is attached an nothing is piped into gitlint. This occurs in
+ """ Test the scenario where no TTY is attached and nothing is piped into gitlint. This occurs in
CI runners like Jenkins and Gitlab, see https://github.com/jorisroovers/gitlint/issues/42 for details.
This is the equivalent of doing:
$ echo -n "" | gitlint