diff options
| author | Glenn Morris | 2013-11-23 12:42:38 -0800 |
|---|---|---|
| committer | Glenn Morris | 2013-11-23 12:42:38 -0800 |
| commit | f4d341afb66e0418d9a0c41db08096d917568bd8 (patch) | |
| tree | 2725f9362380dbc7b1e8d8b3c749a11aed0547df /test/automated/python-tests.el | |
| parent | 3cfb6af3af535146d22ef103f8472a08edd8c215 (diff) | |
| download | emacs-f4d341afb66e0418d9a0c41db08096d917568bd8.tar.gz emacs-f4d341afb66e0418d9a0c41db08096d917568bd8.zip | |
Use skip-unless in some python tests
* test/automated/python-tests.el (python-shell-parse-command-1)
(python-shell-make-comint-1, python-shell-make-comint-2)
(python-shell-get-process-1)
(python-shell-internal-get-or-create-process-1):
Skip rather than fail if prereqs not found.
Diffstat (limited to 'test/automated/python-tests.el')
| -rw-r--r-- | test/automated/python-tests.el | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/test/automated/python-tests.el b/test/automated/python-tests.el index ef1c0155ab5..3c93c557b8e 100644 --- a/test/automated/python-tests.el +++ b/test/automated/python-tests.el | |||
| @@ -1448,9 +1448,7 @@ def f(): | |||
| 1448 | "Check the command to execute is calculated correctly. | 1448 | "Check the command to execute is calculated correctly. |
| 1449 | Using `python-shell-interpreter' and | 1449 | Using `python-shell-interpreter' and |
| 1450 | `python-shell-interpreter-args'." | 1450 | `python-shell-interpreter-args'." |
| 1451 | :expected-result (if (executable-find python-tests-shell-interpreter) | 1451 | (skip-unless (executable-find python-tests-shell-interpreter)) |
| 1452 | :passed | ||
| 1453 | :failed) | ||
| 1454 | (let ((python-shell-interpreter (executable-find | 1452 | (let ((python-shell-interpreter (executable-find |
| 1455 | python-tests-shell-interpreter)) | 1453 | python-tests-shell-interpreter)) |
| 1456 | (python-shell-interpreter-args "-B")) | 1454 | (python-shell-interpreter-args "-B")) |
| @@ -1522,9 +1520,7 @@ Using `python-shell-interpreter' and | |||
| 1522 | 1520 | ||
| 1523 | (ert-deftest python-shell-make-comint-1 () | 1521 | (ert-deftest python-shell-make-comint-1 () |
| 1524 | "Check comint creation for global shell buffer." | 1522 | "Check comint creation for global shell buffer." |
| 1525 | :expected-result (if (executable-find python-tests-shell-interpreter) | 1523 | (skip-unless (executable-find python-tests-shell-interpreter)) |
| 1526 | :passed | ||
| 1527 | :failed) | ||
| 1528 | (let* ((python-shell-interpreter | 1524 | (let* ((python-shell-interpreter |
| 1529 | (executable-find python-tests-shell-interpreter)) | 1525 | (executable-find python-tests-shell-interpreter)) |
| 1530 | (proc-name (python-shell-get-process-name nil)) | 1526 | (proc-name (python-shell-get-process-name nil)) |
| @@ -1544,9 +1540,7 @@ Using `python-shell-interpreter' and | |||
| 1544 | 1540 | ||
| 1545 | (ert-deftest python-shell-make-comint-2 () | 1541 | (ert-deftest python-shell-make-comint-2 () |
| 1546 | "Check comint creation for internal shell buffer." | 1542 | "Check comint creation for internal shell buffer." |
| 1547 | :expected-result (if (executable-find python-tests-shell-interpreter) | 1543 | (skip-unless (executable-find python-tests-shell-interpreter)) |
| 1548 | :passed | ||
| 1549 | :failed) | ||
| 1550 | (let* ((python-shell-interpreter | 1544 | (let* ((python-shell-interpreter |
| 1551 | (executable-find python-tests-shell-interpreter)) | 1545 | (executable-find python-tests-shell-interpreter)) |
| 1552 | (proc-name (python-shell-internal-get-process-name)) | 1546 | (proc-name (python-shell-internal-get-process-name)) |
| @@ -1566,9 +1560,7 @@ Using `python-shell-interpreter' and | |||
| 1566 | 1560 | ||
| 1567 | (ert-deftest python-shell-get-process-1 () | 1561 | (ert-deftest python-shell-get-process-1 () |
| 1568 | "Check dedicated shell process preference over global." | 1562 | "Check dedicated shell process preference over global." |
| 1569 | :expected-result (if (executable-find python-tests-shell-interpreter) | 1563 | (skip-unless (executable-find python-tests-shell-interpreter)) |
| 1570 | :passed | ||
| 1571 | :failed) | ||
| 1572 | (python-tests-with-temp-file | 1564 | (python-tests-with-temp-file |
| 1573 | "" | 1565 | "" |
| 1574 | (let* ((python-shell-interpreter | 1566 | (let* ((python-shell-interpreter |
| @@ -1627,9 +1619,7 @@ Using `python-shell-interpreter' and | |||
| 1627 | 1619 | ||
| 1628 | (ert-deftest python-shell-internal-get-or-create-process-1 () | 1620 | (ert-deftest python-shell-internal-get-or-create-process-1 () |
| 1629 | "Check internal shell process creation fallback." | 1621 | "Check internal shell process creation fallback." |
| 1630 | :expected-result (if (executable-find python-tests-shell-interpreter) | 1622 | (skip-unless (executable-find python-tests-shell-interpreter)) |
| 1631 | :passed | ||
| 1632 | :failed) | ||
| 1633 | (python-tests-with-temp-file | 1623 | (python-tests-with-temp-file |
| 1634 | "" | 1624 | "" |
| 1635 | (should (not (process-live-p (python-shell-internal-get-process-name)))) | 1625 | (should (not (process-live-p (python-shell-internal-get-process-name)))) |