test: Convert some more test cases to pytest+pexpect

scop · Jul 7, 2018 · aece7ad · aece7ad
1 parent 649cd43
commit aece7ad
Show file tree

Hide file tree

Showing 25 changed files with 146 additions and 264 deletions.
diff --git a/test/completion/configure.exp b/test/completion/configure.exp
diff --git a/test/completion/cvs.exp b/test/completion/cvs.exp
diff --git a/test/completion/cvsps.exp b/test/completion/cvsps.exp
diff --git a/test/completion/feh.exp b/test/completion/feh.exp
diff --git a/test/completion/fio.exp b/test/completion/fio.exp
diff --git a/test/completion/mencoder.exp b/test/completion/mencoder.exp
diff --git a/test/completion/mplayer.exp b/test/completion/mplayer.exp
diff --git a/test/completion/ssh-copy-id.exp b/test/completion/ssh-copy-id.exp
diff --git a/test/lib/completions/configure.exp b/test/lib/completions/configure.exp
diff --git a/test/lib/completions/cvs.exp b/test/lib/completions/cvs.exp
diff --git a/test/lib/completions/cvsps.exp b/test/lib/completions/cvsps.exp
diff --git a/test/lib/completions/feh.exp b/test/lib/completions/feh.exp
diff --git a/test/lib/completions/fio.exp b/test/lib/completions/fio.exp
diff --git a/test/lib/completions/mencoder.exp b/test/lib/completions/mencoder.exp
diff --git a/test/lib/completions/mplayer.exp b/test/lib/completions/mplayer.exp
diff --git a/test/lib/completions/ssh-copy-id.exp b/test/lib/completions/ssh-copy-id.exp
diff --git a/test/t/Makefile.am b/test/t/Makefile.am
@@ -78,6 +78,7 @@ EXTRA_DIST = \
 	test_complete.py \
 	test_composite.py \
 	test_config_list.py \
+	test_configure.py \
 	test_conjure.py \
 	test_convert.py \
 	test_co.py \
@@ -93,6 +94,8 @@ EXTRA_DIST = \
 	test_csplit.py \
 	test_curl.py \
 	test_cut.py \
+	test_cvsps.py \
+	test_cvs.py \
 	test_date.py \
 	test_dd.py \
 	test_declare.py \
@@ -132,11 +135,13 @@ EXTRA_DIST = \
 	test_faillog.py \
 	test_fbgs.py \
 	test_fbi.py \
+	test_feh.py \
 	test_filefrag.py \
 	test_file.py \
 	test_file-roller.py \
 	test_filesnarf.py \
 	test_find_member.py \
+	test_fio.py \
 	test_fmt.py \
 	test_fold.py \
 	test_freebsd-update.py \
@@ -290,6 +295,7 @@ EXTRA_DIST = \
 	test_mdecrypt.py \
 	test_mdtool.py \
 	test_medusa.py \
+	test_mencoder.py \
 	test_mii-diag.py \
 	test_mii-tool.py \
 	test_minicom.py \
@@ -304,6 +310,7 @@ EXTRA_DIST = \
 	test_mogrify.py \
 	test_monodevelop.py \
 	test_montage.py \
+	test_mplayer.py \
 	test_msgsnarf.py \
 	test_msynctool.py \
 	test_mtx.py \
@@ -456,6 +463,7 @@ EXTRA_DIST = \
 	test_spovray.py \
 	test_sqlite3.py \
 	test_ssh-add.py \
+	test_ssh-copy-id.py \
 	test_ssh-keygen.py \
 	test_sshmitm.py \
 	test_sshow.py \

diff --git a/test/t/test_configure.py b/test/t/test_configure.py
@@ -0,0 +1,16 @@
+import pytest
+
+
+@pytest.mark.pre_commands(
+    # Make sure our own ./configure is in PATH
+    "PATH+=:$PWD/../..",
+)
+class TestConfigure(object):
+
+    @pytest.mark.complete("configure --")
+    def test_1(self, completion):
+        assert completion.list
+
+    @pytest.mark.complete("configure --prefix ")
+    def test_2(self, completion):
+        assert completion.list
diff --git a/test/t/test_cvs.py b/test/t/test_cvs.py
@@ -0,0 +1,19 @@
+import pytest
+
+
+@pytest.mark.pre_commands(
+    "HOME=$PWD/cvs",
+)
+class TestCvs(object):
+
+    @pytest.mark.complete("cvs ")
+    def test_1(self, completion):
+        assert completion.list
+
+    @pytest.mark.complete("cvs -d ")
+    def test_2(self, completion):
+        assert [x for x in completion.list if ":pserver:" in x]
+
+    @pytest.mark.complete("cvs diff foo/", cwd="cvs")
+    def test_3(self, completion):
+        assert completion.list == ["foo/bar"]
diff --git a/test/t/test_cvsps.py b/test/t/test_cvsps.py
@@ -0,0 +1,15 @@
+import pytest
+
+
+@pytest.mark.pre_commands(
+    "HOME=$PWD/cvs",
+)
+class TestCvsps(object):
+
+    @pytest.mark.complete("cvsps -")
+    def test_1(self, completion):
+        assert completion.list
+
+    @pytest.mark.complete("cvsps ")
+    def test_2(self, completion):
+        assert [x for x in completion.list if ":pserver:" in x]