Merge lp:~dpb/lp2kanban/filter-bugs-correct-movement into lp:lp2kanban

[David Britton]

- Remove archive from default board fetch, this speeds up operations significantly. I don't have any way exposed externally from the config to turn this back on, but we don't use this, so I'm skipping for now.
- Remove cards inside taskboard from board fetch. This speeds up operations significantly, and we currently have no use case for automation moving inside a taskboard, nor does the config support doing these kinds of operations for us.
- Add clean make target
- Update README to talk about using a virtualenv for testing
- Add bug filter and card filter for testing individual moves on the board
- Add logging (follow on branch will convert all prints to logging calls
- log interesting paths for easier post-mortem log analysis (Moves and syncs)
- Explicitly skip attempting to move for no-op cases (before we relied on lkk to noop our request for us)

- Remove archive from default board fetch, this speeds up operations significantly. I don't have any way exposed externally from the config to turn this back on, but we don't use this, so I'm skipping for now.
- Remove cards inside taskboard from board fetch. This speeds up operations significantly, and we currently have no use case for automation moving inside a taskboard, nor does the config support doing these kinds of operations for us.
- Add clean make target
- Update README to talk about using a virtualenv for testing
- Add bug filter and card filter for testing individual moves on the board
- Add logging (follow on branch will convert all prints to logging calls
- log interesting paths for easier post-mortem log analysis (Moves and syncs)
- Explicitly skip attempting to move for no-op cases (before we relied on lkk to noop our request for us)

After doing this, I cleaned up lp:~landscape/landscape/lp2kanban-configs, and added better descriptions to that file.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make check
Result: Fail
Revno: 162
Branch: lp:~davidpbritton/lp2kanban/filter-bugs-correct-movement
Jenkins: https://ci.lscape.net/job/latch-test/9627/

review: Needs Fixing (test results)

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: http_proxy=$ci_proxy https_proxy=$ci_proxy make ci-test
Result: Success
Revno: 163
Branch: lp:~davidpbritton/lp2kanban/filter-bugs-correct-movement
Jenkins: https://ci.lscape.net/job/latch-test/9632/

review: Approve (test results)

[David Britton (dpb)]

Fixed Adam's comments

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: http_proxy=$CI_PROXY https_proxy=$CI_PROXY make ci-test
Result: Fail
Revno: 164
Branch: lp:~davidpbritton/lp2kanban/filter-bugs-correct-movement
Jenkins: https://ci.lscape.net/job/latch-test/10135/

review: Needs Fixing (test results)

[David Britton (dpb)]

Addressed all comments.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: http_proxy=$CI_PROXY https_proxy=$CI_PROXY make ci-test
Result: Fail
Revno: 165
Branch: lp:~davidpbritton/lp2kanban/filter-bugs-correct-movement
Jenkins: https://ci.lscape.net/job/latch-test/10136/

review: Needs Fixing (test results)

[Eric Snow (ericsnowcurrently)]

Other than one small fix, +1. Thanks for taking the time on this!

review: Approve

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: http_proxy=$CI_PROXY https_proxy=$CI_PROXY make ci-test
Result: Fail
Revno: 166
Branch: lp:~davidpbritton/lp2kanban/filter-bugs-correct-movement
Jenkins: https://ci.lscape.net/job/latch-test/10137/

review: Needs Fixing (test results)

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: http_proxy=$CI_PROXY https_proxy=$CI_PROXY make ci-test
Result: Fail
Revno: 167
Branch: lp:~davidpbritton/lp2kanban/filter-bugs-correct-movement
Jenkins: https://ci.lscape.net/job/latch-test/10138/

review: Needs Fixing (test results)

[🤖 Landscape Builder (landscape-builder)]

The attempt to merge lp:~davidpbritton/lp2kanban/filter-bugs-correct-movement into lp:lp2kanban failed. Below is the output from the failed tests.

test -d venv || virtualenv venv; \
 . venv/bin/activate; \
 make check
New python executable in venv/bin/python
Installing setuptools, pip...done.
make[1]: Entering directory `/var/tmp/tarmac/lp2kanban/trunk'
mkdir download-cache
python bootstrap.py -v 1.7.1 -f eggs -c buildout.cfg
make[1]: Leaving directory `/var/tmp/tarmac/lp2kanban/trunk'

Traceback (most recent call last):
  File "bootstrap.py", line 80, in <module>
    exec(urlopen('https://bootstrap.pypa.io/ez_setup.py').read(), ez)
  File "/usr/lib/python2.7/urllib2.py", line 127, in urlopen
    return _opener.open(url, data, timeout)
  File "/usr/lib/python2.7/urllib2.py", line 404, in open
    response = self._open(req, data)
  File "/usr/lib/python2.7/urllib2.py", line 422, in _open
    '_open', req)
  File "/usr/lib/python2.7/urllib2.py", line 382, in _call_chain
    result = func(*args)
  File "/usr/lib/python2.7/urllib2.py", line 1222, in https_open
    return self.do_open(httplib.HTTPSConnection, req)
  File "/usr/lib/python2.7/urllib2.py", line 1184, in do_open
    raise URLError(err)
urllib2.URLError: <urlopen error Tunnel connection failed: 403 Forbidden>
make[1]: *** [bin/buildout] Error 1
make: *** [ci-test] Error 2

[🤖 Landscape Builder (landscape-builder)]

No approved revision specified.

=== modified file 'Makefile'
--- Makefile	2016-08-29 20:18:23 +0000
+++ Makefile	2016-09-01 21:37:25 +0000
@@ -17,12 +17,14 @@
 # buildout.
 BUILDOUT_BIN = $(PY) bin/tags bin/test
 
-default: check
+default: bin/test
 
 
 download-cache:
 	mkdir download-cache
 
+clean:
+	@rm -rf bin
 
 bin/buildout: download-cache
 	$(PYTHON) bootstrap.py -v 1.7.1 -f eggs -c buildout.cfg
@@ -59,4 +61,4 @@
 	. venv/bin/activate; \
 	$(MAKE) check
 
-.PHONY: check default configs needs-xdg-utils ci-test
+.PHONY: check default configs needs-xdg-utils clean ci-test
 
=== modified file 'README'
--- README	2012-12-10 15:21:44 +0000
+++ README	2016-09-01 21:37:25 +0000
@@ -38,5 +38,11 @@
 Testing
 -------
 
+All tests should work on 16.04+, please run in a vitrualenv though:
+
+    virtualenv ve
+    source ve/bin/activate
+    make check
+
 'lp2kanban test' board configuration connects to LP staging by default
 to allow easier testing.
 
=== modified file 'jenkins.sh'
--- jenkins.sh	2015-12-16 16:56:38 +0000
+++ jenkins.sh	2016-09-01 21:37:25 +0000
@@ -1,6 +1,5 @@
 #!/bin/bash -xe
 
-ini="$1.ini"
 date "+START: %c"
 
 #export https_proxy=http://squid.external:3128
@@ -28,5 +27,7 @@
 # - https://stackoverflow.com/questions/1473577
 # - https://stackoverflow.com/questions/492483
 # - https://stackoverflow.com/questions/9932406
-PYTHONIOENCODING="utf-8" bin/py src/lp2kanban/bugs2cards.py -c configs/${1}.ini
+config=$1
+shift
+PYTHONIOENCODING="utf-8" bin/py src/lp2kanban/bugs2cards.py -c "configs/${config}.ini" "${@}"
 date "+END: %c"
 
=== modified file 'setup.py'
--- setup.py	2016-04-13 16:06:23 +0000
+++ setup.py	2016-09-01 21:37:25 +0000
@@ -18,6 +18,7 @@
         'requests',
         'setuptools',
         'simplejson',
+        'testfixtures',
         'testtools',
         ],
     )
 
=== modified file 'src/lp2kanban/bugs2cards.py'
--- src/lp2kanban/bugs2cards.py	2016-08-26 17:11:41 +0000
+++ src/lp2kanban/bugs2cards.py	2016-09-01 21:37:25 +0000
@@ -3,6 +3,7 @@
 from ConfigParser import ConfigParser
 from argparse import ArgumentParser
 from launchpadlib.launchpad import Launchpad
+import logging
 from lp2kanban.cards2workitems import (
     convert_cards_to_work_items,
     get_blueprint_linked_cards,
@@ -45,7 +46,13 @@
         help="List available kanban boards.")
     parser.add_argument(
         '-d', '--debug', action='store_const', const=True, default=False,
-        help="Turn on debugging for HTTP traffic")
+        help="Turn on logging debug, debugging for HTTP traffic")
+    parser.add_argument(
+        '-B', '--bug', required=False, type=int, default=None,
+        help="Only operate on this bug.")
+    parser.add_argument(
+        '-C', '--card', required=False, type=int, default=None,
+        help="Only operate on this card id, can obtain by looking at URL.")
     return parser
 
 
@@ -207,7 +214,8 @@
     return lp_bug
 
 
-def move_cards_to_feature_taskboard(feature_card, feature_bug, source_lanes):
+def move_cards_to_feature_taskboard(
+        feature_card, feature_bug, source_lanes, filter_card=None):
     """Move all cards related to subtasks of the feature_card.
 
     This will only move cards which are in the landing_lanes or deploy_lanes.
@@ -220,6 +228,8 @@
     """
     linked_cards = get_cards_for_feature(feature_card, feature_bug=feature_bug)
     for card in linked_cards:
+        if filter_card and filter_card != card.id:
+            return
         if card.type.name == "Feature":  # We don't want to move feature cards
              continue
         card_path = card.lane.path
@@ -349,11 +359,14 @@
     """
     if conf.get('sync_cards', 'off') == 'off':
         return False
+    logging.debug("Should I sync? - {}".format(card.title))
     no_sync_lanes = [
         lane_path.strip()
         for lane_path in conf.get("no_sync_lanes", "").split(",")]
     for no_sync_lane_path in no_sync_lanes:
         if no_sync_lane_path and card.lane.path.endswith(no_sync_lane_path):
+            logging.debug("Not syncing, {} in no_sync_lanes".format(
+                card.lane.path))
             return False
     if conf.get('autosync', None) in ['on', 'active-projects']:
         has_id = (card.external_card_id is not None and
@@ -666,6 +679,7 @@
 
 def create_cards(board, bconf, lp_users, lp_projects):
     """Create new cards on all projects."""
+    logging.info("Creating new cards")
     new_bug_tag = bconf.get("bug_to_card_tag")
     if new_bug_tag is not None:
         for lp_project in lp_projects:
@@ -674,10 +688,13 @@
                 bconf.get("bug_to_card_lane"), lp_users.feature_lanes)
 
 
-def sync_cards_linked_branches(board, bconf, lp, lp_users):
+def sync_cards_linked_branches(
+        board, bconf, lp, lp_users, filter_card=None):
     """Sync any cards that have linked external branches."""
-    print "   Syncing branch cards:"
+    logging.info("Syncing branch cards")
     for card in board.getCardsWithExternalLinks(only_branches=True):
+        if filter_card and filter_card != card.id:
+            continue
         if card.external_card_id:
             # Cards with external_id are processed by getCardsWithExternalIds
             continue
@@ -714,9 +731,16 @@
                     print "   * %s (in %s)" % (card.title, card_path)
 
 
-def sync_cards_external_ids(board, bconf, lp, lp_users, lp_projects):
+def sync_cards_external_ids(
+        board, bconf, lp, lp_users, lp_projects, filter_bug=None,
+        filter_card=None):
     """Sync any cards that have linked external ids (bugs in launchpad)."""
+    logging.info("Syncing cards with external ids")
     for card in board.getCardsWithExternalIds():
+        if filter_bug and card.external_card_id != filter_bug:
+            continue
+        if filter_card and filter_card != card.id:
+            continue
         if should_sync_card(card, bconf):
             lp_bug = get_lp_bug(card, lp)
             if lp_bug is None:
@@ -763,8 +787,10 @@
                 print "   * %s: %s -- Not synced" % (
                     lp_bug.id, card.title)
 
-def move_cards_to_taskboards(board, bconf, lp, lp_users):
+def move_cards_to_taskboards(
+        board, bconf, lp, lp_users, filter_card=None):
     """Move branch cards to feature cards if they are landed."""
+    logging.info("Move cards to taskboards")
     if "${group}" in bconf["landing_lanes"]:
         # Replace the optional template ${group} with configured board groups.
         # This creates a list of landing_lanes, one per group on the board.
@@ -779,11 +805,12 @@
             feature_card.lane.path in valid_taskboard_lanes):
             lp_bug = get_lp_bug(feature_card, lp)
             move_cards_to_feature_taskboard(
-                feature_card, lp_bug, valid_taskboard_lanes)
+                feature_card, lp_bug, valid_taskboard_lanes, filter_card)
 
 
 def convert_cards_to_work_items(board, bconf, lp, lp_users, lp_projects):
     """Create work items out of cards if desired."""
+    logging.info("Convert cards to work items")
     if bconf.get("convert_cards_to_work_items", False) == "on":
         # Sync cards to blueprint work items, if so configured.
         print "   Checking for cards to sync with work items..."
@@ -808,25 +835,46 @@
 
     If a card is located in a "no_move" lane, the card won't get moved.
     """
+    logging.debug("Evaluating for move: {}".format(card.title))
     target_lane_path = bconf[ConfigOptionByStatus[bug_status]]
-    if assignees:
-        group = lp_users.lp_to_group.get(assignees[0].name)
-        if group:
-            target_lane_path = target_lane_path.replace("${group}", group)
+    if "${group}" in target_lane_path:
+        if assignees:
+            group = lp_users.lp_to_group.get(assignees[0].name)
+            if group:
+                target_lane_path = target_lane_path.replace("${group}", group)
+            else:
+                logging.debug(
+                    "Not moving, assignee: {} not in group: {}".format(
+                        assignees[0].name, group))
+                return
+        else:
+            logging.debug("Not moving, not assigned")
+            return
+
     omnidirectional_card_moves = (
         bconf.get("omnidirectional_card_moves", "on") == "on")
     no_move_lanes = [
         lane_path.strip()
-        for lane_path in bconf.get("no_move_lanes", "").split(",")]
+        for lane_path in bconf.get("no_move_lanes", "").split(",")
+        if lane_path]
     for no_move_lane_path in no_move_lanes:
         if no_move_lane_path and card.lane.path.endswith(no_move_lane_path):
+            logging.debug("Not moving, {} in no_move_lanes".format(
+                card.lane.path))
             return
+
     if omnidirectional_card_moves:
         target_lane = find_card_target_lane_omnidirectional(
             card.lane, target_lane_path)
     else:
         target_lane = find_card_target_lane_next(
             card.lane, target_lane_path)
+    if card.lane.path == target_lane_path:
+        logging.debug("Not moving, already in {}".format(card.lane.path))
+        return
+
+    logging.debug(
+        " * Moving: {} -> {}".format(card.lane.path, target_lane_path))
     card.move(target_lane)
 
 
@@ -853,13 +901,43 @@
             continue
 
 
+def process_board(board, bconf, filter_bug, filter_card):
+    """Sync a given board.
+
+    Decomposition of main, and handles interpreting
+    filter arguments.
+    """
+    lp, lp_projects, lp_users = get_lp_data(board, bconf)
+    if not filter_bug and not filter_card:
+        create_cards(board, bconf, lp_users, lp_projects)
+    if not filter_bug:
+        sync_cards_linked_branches(
+            board, bconf, lp, lp_users, filter_card=filter_card)
+    sync_cards_external_ids(
+        board, bconf, lp, lp_users, lp_projects, filter_bug=filter_bug,
+        filter_card=filter_card)
+    if not filter_bug:
+        move_cards_to_taskboards(
+            board, bconf, lp, lp_users, filter_card=filter_card)
+    if not filter_bug and not filter_card:
+        convert_cards_to_work_items(board, bconf, lp, lp_users, lp_projects)
+    save_board(board)
+
+
 def main(argv):
     """Update the Yellow team's kanban board with data from Launchpad."""
     args = get_arg_parser().parse_args()
+    if args.bug:
+        args.bug = str(args.bug)
 
     if args.debug:
+        logging.basicConfig(
+            level=logging.DEBUG, format='%(asctime)s %(levelname)s %(message)s')
         import httplib
         httplib.HTTPConnection.debuglevel = 1
+    else:
+        logging.basicConfig(
+            level=logging.INFO, format='%(asctime)s %(levelname)s %(message)s')
 
     config = ConfigParser()
     config.read(args.config)
@@ -891,13 +969,7 @@
                 print "Could not retrieve board.  Skipping."
                 continue
             bconf = boards_config[board_name]
-            lp, lp_projects, lp_users = get_lp_data(board, bconf)
-            create_cards(board, bconf, lp_users, lp_projects)
-            sync_cards_linked_branches(board, bconf, lp, lp_users)
-            sync_cards_external_ids(board, bconf, lp, lp_users, lp_projects)
-            move_cards_to_taskboards(board, bconf, lp, lp_users)
-            convert_cards_to_work_items(board, bconf, lp, lp_users)
-            save_board(board)
+            process_board(board, bconf, args.bug, args.card)
         except (KeyError, AssertionError) as e:
             print "Exception caught.  Skipping board."
             print_exc()
 
=== modified file 'src/lp2kanban/kanban.py'
--- src/lp2kanban/kanban.py	2016-04-14 20:50:10 +0000
+++ src/lp2kanban/kanban.py	2016-09-01 21:37:25 +0000
@@ -3,6 +3,7 @@
 
 import requests
 import json
+import logging
 import operator
 from pprint import pprint
 import re
@@ -180,9 +181,8 @@
             return name.upper()
 
     def __setattr__(self, attr, value):
-        if ((not hasattr(self, attr) or
-             getattr(self, attr, None) != value) and
-            attr in self._watched_attrs):
+        if (getattr(self, attr, object()) != value and
+                attr in self._watched_attrs):
             self.direct_setattr('is_dirty', True)
             self.dirty_attrs.add(attr)
         self.direct_setattr(attr, value)
@@ -531,30 +531,38 @@
     def getCardsWithDescriptionAnnotations(self):
         return self._cards_with_description_annotations
 
-    def fetchDetails(self):
+    def fetchDetails(self, include_archive=False, include_taskboards=False):
+        """Fetch all details from the board into our datastructure.
+
+        include_taskboards - add all cards on taskboards into my card list
+        include_archive - add all cards from archive into my card list.
+        """
         self.details = self.connector.get(
             self.base_uri + str(self.id)).ReplyData[0]
 
         self._populateUsers(self.details['BoardUsers'])
         self._populateCardTypes(self.details['CardTypes'])
-        self._archive = self.connector.get(
-            "/Kanban/Api/Board/" + str(self.id) + "/Archive").ReplyData[0]
-        archive_lanes = [lane_dict['Lane'] for lane_dict in self._archive]
-        archive_lanes.extend(
-            [lane_dict['Lane'] for
-            lane_dict in self._archive[0]['ChildLanes']])
-        self._backlog = self.connector.get(
+        lanes = self.details['Lanes']
+        if include_archive:
+            self._archive = self.connector.get(
+                "/Kanban/Api/Board/" + str(self.id) + "/Archive").ReplyData[0]
+            archive_lanes = [lane_dict['Lane'] for lane_dict in self._archive]
+            archive_lanes.extend(
+                [lane_dict['Lane'] for
+                lane_dict in self._archive[0]['ChildLanes']])
+            lanes += archive_lanes
+        lanes += self.connector.get(
             "/Kanban/Api/Board/" + str(self.id) + "/Backlog").ReplyData[0]
-        self._populateLanes(
-            self.details['Lanes'] + archive_lanes + self._backlog)
-        for card in self.cards:
-            if card.current_task_board_id:  # We are a task board
-                taskboard_data = self.connector.get(
-                    "/Kanban/Api/v1/board/%s/card/%s/taskboard" % (self.id, card.id))
-                card.taskboard = LeankitTaskBoard(
-                    taskboard_data["ReplyData"][0], self, card)
-                card.taskboard.fetchDetails()
-                self.cards.extend(card.taskboard.cards)
+        self._populateLanes(lanes)
+        if include_taskboards:
+            for card in self.cards:
+                if card.current_task_board_id:  # We are a task board
+                    taskboard_data = self.connector.get(
+                        "/Kanban/Api/v1/board/%s/card/%s/taskboard" % (self.id, card.id))
+                    card.taskboard = LeankitTaskBoard(
+                        taskboard_data["ReplyData"][0], self, card)
+                    card.taskboard.fetchDetails()
+                    self.cards.extend(card.taskboard.cards)
         self._classifyCards()
         self._populateFeatureTagPaths()
 
@@ -769,10 +777,10 @@
             board = self._findBoardInCache(board_id, title)
         return board
 
-    def getBoard(self, board_id=None, title=None):
+    def getBoard(self, board_id=None, title=None, include_archive=False):
         board = self._findBoard(board_id, title)
         if board is not None:
-            board.fetchDetails()
+            board.fetchDetails(include_archive=include_archive)
         return board
 
 
 
=== modified file 'src/lp2kanban/tests/common.py'
--- src/lp2kanban/tests/common.py	2016-05-02 23:07:28 +0000
+++ src/lp2kanban/tests/common.py	2016-09-01 21:37:25 +0000
@@ -1,10 +1,13 @@
 # Copyright 2012 Canonical Ltd.
 """Common fixtures for lp2kanban tests."""
 
+import uuid
+
+from lp2kanban.kanban import Record
+
+
 __metaclass__ = type
 
-from lp2kanban.kanban import Record
-
 
 class FauxCardType:
 
@@ -123,6 +126,7 @@
         self.external_system_url = external_system_url
         self.moved_to = None
         self.saved = False
+        self.id = uuid.uuid1()
 
     def save(self):
         """A no-op for compatibility."""
 
=== modified file 'src/lp2kanban/tests/test_bugs2cards.py'
--- src/lp2kanban/tests/test_bugs2cards.py	2016-08-25 22:37:31 +0000
+++ src/lp2kanban/tests/test_bugs2cards.py	2016-09-01 21:37:25 +0000
@@ -13,6 +13,8 @@
 import datetime
 import unittest
 
+from testfixtures import log_capture
+
 from lp2kanban.bugs2cards import (
     CardStatus,
     create_cards_in_project,
@@ -50,7 +52,6 @@
     )
 
 
-
 def parse_config_text(text):
     config = ConfigParser()
     config.readfp(StringIO(dedent(text)))
@@ -1489,7 +1490,18 @@
         move_card(card, CardStatus.CODING, self.bconf, [], self.lp_users)
         self.assertEqual("coding", card.moved_to.path)
 
-    def test_group_no_assignee(self):
+    @log_capture()
+    def test_noop(self, testlog):
+        """Skip move attempt if already in right path."""
+        card = self.qa.addCard(FauxCard())
+        move_card(card, CardStatus.QA, self.bconf, [], self.lp_users)
+        self.assertEqual(None, card.moved_to)
+        testlog.check(
+            ('root', 'DEBUG', 'Evaluating for move: '),
+            ('root', 'DEBUG', 'Not moving, already in qa'))
+
+    @log_capture()
+    def test_group_no_assignee(self, testlog):
         # If a target lane requires a group, and the card doesn't have
         # an assignee, the card isn't moved.
         self.bconf["coding_lanes"] = "${group}::coding"
@@ -1497,6 +1509,9 @@
         card = self.backlog.addCard(FauxCard())
         move_card(card, CardStatus.CODING, self.bconf, [], self.lp_users)
         self.assertEqual(None, card.moved_to)
+        testlog.check(
+            ('root', 'DEBUG', 'Evaluating for move: '),
+            ('root', 'DEBUG', 'Not moving, not assigned'))
 
     def test_group_assignee_in_group(self):
         # If a target lane requires a group, and the card has an
@@ -1511,7 +1526,8 @@
             self.lp_users)
         self.assertEqual("test group::coding", card.moved_to.path)
 
-    def test_group_assignee_not_in_group(self):
+    @log_capture()
+    def test_group_assignee_not_in_group(self, testlog):
         # If a target lane requires a group, and the card has an
         # assignee that is not part of a group, the card isn't moved.
         self.bconf["coding_lanes"] = "${group}::coding"
@@ -1522,6 +1538,11 @@
             card, CardStatus.CODING, self.bconf, [FauxPerson("bar")],
             self.lp_users)
         self.assertEqual(None, card.moved_to)
+        testlog.check(
+            ('root', 'DEBUG', 'Evaluating for move: '),
+            ('root', 'DEBUG', 'Not moving, assignee: bar not in group: None'))
+
+
 
     def test_no_move_lanes(self):
         # Cards in a "no_move" lane doesn't get moved by move_card().
@@ -1709,6 +1730,86 @@
         self.assertEqual(self.feature_card, landed_card1.moved_to)
         self.assertEqual(self.feature_card, landed_card2.moved_to)
 
+    def test_sync_cards_external_ids_filter_card(self):
+    	"""filter_card skips and selects correctly."""
+        # Configure bugs2cards to sync only active-projects myproject1 and myproject2
+        self.bconf.update({
+            "autosync": "active-projects",
+            "projects": "myproject",
+            "sync_cards": "on", "move_cards": "on",
+            "new_lanes": "new"})
+        # Setup bug1 and bug2 in separate projects which both need to move coding -> new
+        project1 = FauxTarget(resource_type_link="project", project="myproject")
+        lp_users = FauxLaunchpadUsersForBoard(lp_to_kanban={"person1": "Person One"})
+        lp_projects = [project1]
+        bug_task1 = FauxBugTask(
+            bug_id=123, target=project1, title='Test bug in myproject',
+            description='Test bug description.')
+        bug_task2 = FauxBugTask(
+            bug_id=456, target=project1, title='Test bug in otherproject',
+            description='Test bug description.')
+        bug_card1 = FauxCard(
+            title='BugCard123', external_card_id=u'123')
+        bug_card2 = FauxCard(
+            title='BugCard456', external_card_id=u'456')
+        board = FauxBoard(
+            cards=[bug_card1, bug_card2], bug_cards=[bug_card1, bug_card2])
+        new_lane = board.addLane('new')
+        coding_lane = board.addLane('coding')
+        bug_card1.lane = coding_lane
+        bug_card2.lane = coding_lane
+        bug_type = FauxCardType(id=3, name='Bug', is_default=False)
+        bug_card1.type = bug_type
+        bug_card2.type = bug_type
+        self.board.cards.extend([bug_card1, bug_card2])
+        lp = FauxLP({"projects": {"myproject": project1},
+                 "bugs": {123: bug_task1.bug, 456: bug_task2.bug}})
+        sync_cards_external_ids(
+            board, self.bconf, lp, lp_users, lp_projects, filter_card=bug_card2.id)
+        coding_lane = FauxLane(board=board, path='coding')
+        self.assertEqual(new_lane, bug_card2.moved_to)
+        self.assertIsNone(bug_card1.moved_to)
+
+    def test_sync_cards_skips_bugs_not_in_filter_bug(self):
+    	"""filter_bug skips and selects bugs in sync_cards_external_ids."""
+        # Configure bugs2cards to sync only active-projects myproject1 and myproject2
+        self.bconf.update({
+            "autosync": "active-projects",
+            "projects": "myproject",
+            "sync_cards": "on", "move_cards": "on",
+            "new_lanes": "new"})
+        # Setup bug1 and bug2 in separate projects which both need to move coding -> new
+        project1 = FauxTarget(resource_type_link="project", project="myproject")
+        lp_users = FauxLaunchpadUsersForBoard(lp_to_kanban={"person1": "Person One"})
+        lp_projects = [project1]
+        bug_task1 = FauxBugTask(
+            bug_id=123, target=project1, title='Test bug in myproject',
+            description='Test bug description.')
+        bug_task2 = FauxBugTask(
+            bug_id=456, target=project1, title='Test bug in otherproject',
+            description='Test bug description.')
+        bug_card1 = FauxCard(
+            title='BugCard123', external_card_id=u'123')
+        bug_card2 = FauxCard(
+            title='BugCard456', external_card_id=u'456')
+        board = FauxBoard(
+            cards=[bug_card1, bug_card2], bug_cards=[bug_card1, bug_card2])
+        new_lane = board.addLane('new')
+        coding_lane = board.addLane('coding')
+        bug_card1.lane = coding_lane
+        bug_card2.lane = coding_lane
+        bug_type = FauxCardType(id=3, name='Bug', is_default=False)
+        bug_card1.type = bug_type
+        bug_card2.type = bug_type
+        self.board.cards.extend([bug_card1, bug_card2])
+        lp = FauxLP({"projects": {"myproject": project1},
+                 "bugs": {123: bug_task1.bug, 456: bug_task2.bug}})
+        sync_cards_external_ids(
+            board, self.bconf, lp, lp_users, lp_projects, filter_bug=u"456")
+        coding_lane = FauxLane(board=board, path='coding')
+        self.assertEqual(new_lane, bug_card2.moved_to)
+        self.assertIsNone(bug_card1.moved_to)
+
     def test_sync_cards_skips_bugs_of_external_projects_when_active_projects_set(self):
     	"""Bugs of external projects are skipped when autosync set to active-projects."""
         # Configure bugs2cards to sync only active-projects myproject1 and myproject2
@@ -1744,7 +1845,7 @@
         self.board.cards.extend([bug_card1, bug_card2])
         # Include project1 and project2 in our active 'projects' fake LP data
         lp = FauxLP({"projects": {"myproject": project1, "myproject2": project2},
-                 "bugs": {123: bug_task1.bug, "456": bug_task2.bug}})
+                 "bugs": {123: bug_task1.bug, 456: bug_task2.bug}})
         sync_cards_external_ids(board, self.bconf, lp, lp_users, lp_projects)
         coding_lane = FauxLane(board=board, path='coding')
         self.assertEqual(new_lane, bug_card1.moved_to)