diff options
| author | Dmitry Gutov | 2015-02-07 04:18:24 +0300 |
|---|---|---|
| committer | Dmitry Gutov | 2015-02-07 04:26:05 +0300 |
| commit | 66e6398505356b019edee4477b6d4f5f8cdec42d (patch) | |
| tree | ab3ec3ae1ca6576cb411a70b1046cf4c2cd17427 | |
| parent | fa7f79e8234c60ae425f7c3cf1b9486765a7111e (diff) | |
| download | emacs-66e6398505356b019edee4477b6d4f5f8cdec42d.tar.gz emacs-66e6398505356b019edee4477b6d4f5f8cdec42d.zip | |
Make vc-test-svn03-working-revision pass
* test/automated/vc-tests.el (vc-test--working-revision): Fix
`vc-working-revision' checks to be compared against nil, which is
what is should return for unregistered files.
| -rw-r--r-- | test/ChangeLog | 6 | ||||
| -rw-r--r-- | test/automated/vc-tests.el | 14 |
2 files changed, 14 insertions, 6 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index f9a54b53420..e0d4eeb323a 100644 --- a/test/ChangeLog +++ b/test/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2015-02-07 Dmitry Gutov <dgutov@yandex.ru> | ||
| 2 | |||
| 3 | * automated/vc-tests.el (vc-test--working-revision): Fix | ||
| 4 | `vc-working-revision' checks to be compared against nil, which is | ||
| 5 | what is should return for unregistered files. | ||
| 6 | |||
| 1 | 2015-02-06 Nicolas Petton <nicolas@petton.fr> | 7 | 2015-02-06 Nicolas Petton <nicolas@petton.fr> |
| 2 | 8 | ||
| 3 | * automated/seq-tests.el: New tests for seq-mapcat, seq-partition | 9 | * automated/seq-tests.el: New tests for seq-mapcat, seq-partition |
diff --git a/test/automated/vc-tests.el b/test/automated/vc-tests.el index 5b7b3cce039..e83eb85c0fe 100644 --- a/test/automated/vc-tests.el +++ b/test/automated/vc-tests.el | |||
| @@ -330,18 +330,20 @@ For backends which dont support it, `vc-not-supported' is signalled." | |||
| 330 | (vc-working-revision default-directory backend) '("0" "master"))) | 330 | (vc-working-revision default-directory backend) '("0" "master"))) |
| 331 | 331 | ||
| 332 | (let ((tmp-name (expand-file-name "foo" default-directory))) | 332 | (let ((tmp-name (expand-file-name "foo" default-directory))) |
| 333 | ;; Check for initial state. | 333 | ;; Check for initial state, should be nil until it's registered. |
| 334 | (should | 334 | ;; Don't pass the backend explictly, otherwise some implementations |
| 335 | (member (vc-working-revision tmp-name backend) '("0" "master"))) | 335 | ;; return non-nil. |
| 336 | (should (null (vc-working-revision tmp-name))) | ||
| 336 | 337 | ||
| 337 | ;; Write a new file. Check for state. | 338 | ;; Write a new file. Check state. |
| 338 | (write-region "foo" nil tmp-name nil 'nomessage) | 339 | (write-region "foo" nil tmp-name nil 'nomessage) |
| 339 | (should | 340 | (should (null (vc-working-revision tmp-name))) |
| 340 | (member (vc-working-revision tmp-name backend) '("0" "master"))) | ||
| 341 | 341 | ||
| 342 | ;; Register a file. Check for state. | 342 | ;; Register a file. Check for state. |
| 343 | (vc-register | 343 | (vc-register |
| 344 | (list backend (list (file-name-nondirectory tmp-name)))) | 344 | (list backend (list (file-name-nondirectory tmp-name)))) |
| 345 | ;; FIXME: Don't pass the backend. Emacs should be able to | ||
| 346 | ;; figure it out. | ||
| 345 | (should | 347 | (should |
| 346 | (member (vc-working-revision tmp-name backend) '("0" "master"))) | 348 | (member (vc-working-revision tmp-name backend) '("0" "master"))) |
| 347 | 349 | ||