Fix unittest issues introduced by shopfloor v2

BUG=none
TEST=manually run shopfloor_unittest.py and './shopfloord -t'

Original-Change-Id: Ia0dd2773b26b82fb557dce4c124b4bc537c95376
Reviewed-on: https://gerrit.chromium.org/gerrit/48643
Reviewed-by: Rong Chang <rongchang@chromium.org>
Tested-by: Rong Chang <rongchang@chromium.org>
(cherry picked from commit cefaff1f3df3c6fc7830defb7387a1b34d618158)

Change-Id: I6b5c61c3fe2d859f0739ce02240a91f435c85b68
Reviewed-on: https://gerrit.chromium.org/gerrit/48750
Reviewed-by: Vic Yang <victoryang@chromium.org>
Commit-Queue: Rong Chang <rongchang@chromium.org>
Tested-by: Rong Chang <rongchang@chromium.org>
5 files changed