Skip to content

Commit

Permalink
Merge branch 'develop' into python-3.12
Browse files Browse the repository at this point in the history
  • Loading branch information
robtaylor authored Oct 7, 2024
2 parents 5e4a490 + 7865edf commit 7fe35ee
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 76 deletions.
4 changes: 1 addition & 3 deletions doorstop/core/vcs/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,16 @@

"""Interfaces to version control systems."""

import logging
import os

from doorstop import common
from doorstop.common import DoorstopError
from doorstop.core.vcs import git, mercurial, mockvcs, subversion, veracity
from doorstop.core.vcs import git, mercurial, mockvcs, subversion

DEFAULT = mockvcs.WorkingCopy
DIRECTORIES = {
git.WorkingCopy.DIRECTORY: git.WorkingCopy,
subversion.WorkingCopy.DIRECTORY: subversion.WorkingCopy,
veracity.WorkingCopy.DIRECTORY: veracity.WorkingCopy,
mercurial.WorkingCopy.DIRECTORY: mercurial.WorkingCopy,
DEFAULT.DIRECTORY: DEFAULT,
}
Expand Down
39 changes: 0 additions & 39 deletions doorstop/core/vcs/tests/test_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,45 +124,6 @@ def test_commit(self, mock_call):
mock_call.assert_has_calls(calls)


@patch("subprocess.call")
class TestVeracity(BaseTestCase, unittest.TestCase):
"""Tests for the Veracity plugin."""

DIRECTORY = ".sgdrawer"

def test_lock(self, mock_call):
"""Verify Veracity can lock files."""
self.lock()
calls = [call(("vv", "pull")), call(("vv", "update"))]
mock_call.assert_has_calls(calls)

def test_edit(self, mock_call):
"""Verify Veracity can (fake) edit files."""
self.edit()
mock_call.assert_has_calls([])

def test_add(self, mock_call):
"""Verify Veracity can add files."""
self.add()
calls = [call(("vv", "add", self.path))]
mock_call.assert_has_calls(calls)

def test_delete(self, mock_call):
"""Verify Veracity can delete files."""
self.delete()
calls = [call(("vv", "remove", self.path))]
mock_call.assert_has_calls(calls)

def test_commit(self, mock_call):
"""Verify Veracity can commit files."""
self.commit()
calls = [
call(("vv", "commit", "--message", self.message)),
call(("vv", "push")),
]
mock_call.assert_has_calls(calls)


@patch("subprocess.call")
class TestMercurial(BaseTestCase, unittest.TestCase):
"""Tests for the Mercurial plugin."""
Expand Down
34 changes: 0 additions & 34 deletions doorstop/core/vcs/veracity.py

This file was deleted.

0 comments on commit 7fe35ee

Please sign in to comment.