After syncing today, I can no longer run tests with test that. E.g.

~/trunk/src/scripts $ test_that -b squawks chromeos1-row1-rack3-host6 kernel_ExternalUsbPeripheralsDetectionTest.printer_hp
INFO:root:Identity added: /tmp/test_that_results_Qcpxgh/testing_rsa (/tmp/test_that_results_Qcpxgh/testing_rsa)
17:30:50 INFO | Running autotest_quickmerge step.
17:30:51 INFO | quickmerge| 17:30:51: INFO: RunCommand: sudo -- /usr/bin/python2 /mnt/host/source/chromite/bin/autotest_quickmerge '--board=squawks'
17:30:52 INFO | quickmerge| 17:30:52: INFO: RunCommand: rsync -a --no-p '--chmod=ugo=rwX' -u -i '--exclude=**.pyc' '--exclude=**.pyo' '--exclude=** -> *' '--include-from=/mnt/host/source/chromite/scripts/autotest-quickmerge-includepatterns' '--exclude=*' /mnt/host/source/src/third_party/autotest/files/ /build/squawks/usr/local/build/autotest/
17:30:53 INFO | quickmerge| 17:30:53: INFO: Updating portage database.
17:30:53 INFO | quickmerge| 17:30:53: INFO: RunCommand: rsync -a --no-p '--chmod=ugo=rwX' -u -i '--exclude=**.pyc' '--exclude=**.pyo' '--exclude=** -> *' '--include-from=/mnt/host/source/chromite/scripts/autotest-quickmerge-includepatterns' '--exclude=*' // /build/squawks/usr/local/build/autotest/
17:30:53 INFO | quickmerge| 17:30:53: INFO: Updating portage database.
17:30:54 INFO | quickmerge| 17:30:54: INFO: RunCommand: rsync -a --no-p '--chmod=ugo=rwX' -u -i '--exclude=**.pyc' '--exclude=**.pyo' '--exclude=** -> *' '--include-from=/mnt/host/source/chromite/scripts/autotest-quickmerge-includepatterns' '--exclude=*' /mnt/host/source/src/third_party/autotest-private/ /build/squawks/usr/local/build/autotest/
17:30:54 INFO | quickmerge| 17:30:54: INFO: Updating portage database.
17:30:54 INFO | quickmerge| 17:30:54: INFO: RunCommand: touch /build/squawks/usr/local/build/autotest/.quickmerge_sentinel
17:30:54 INFO | quickmerge| 17:30:54: INFO: Quickmerge complete. Created or modified 2 files.
17:30:55 INFO | Re-running test_that script in /build/squawks/usr/local/build/autotest copy of autotest.
INFO:root:Identity added: /tmp/test_that_results_HsQGfr/testing_rsa (/tmp/test_that_results_HsQGfr/testing_rsa)
17:30:55 INFO | Began logging to /tmp/test_that_results_HsQGfr
Adding labels [u'cros-version:ad_hoc_build', u'board:squawks'] to host chromeos1-row1-rack3-host6
19:30:55 INFO | Fetching suite for job named kernel_ExternalUsbPeripheralsDetectionTest.printer_hp...
19:30:57 INFO | Scheduling suite for job named kernel_ExternalUsbPeripheralsDetectionTest.printer_hp...
19:30:57 INFO | ... scheduled 1 job(s).
19:30:58 INFO | autoserv| Results placed in /tmp/test_that_results_HsQGfr/results-1-kernel_ExternalUsbPeripheralsDetectionTest.printer_hp
19:30:58 INFO | autoserv| Logged pid 452 to /tmp/test_that_results_HsQGfr/results-1-kernel_ExternalUsbPeripheralsDetectionTest.printer_hp/.autoserv_execute
19:30:58 INFO | autoserv| 'module' object has no attribute 'get_job_folder_name'
19:30:58 INFO | autoserv| Traceback (most recent call last):
19:30:58 INFO | autoserv| File "/build/squawks/usr/local/build/autotest/server/autoserv", line 769, in main
19:30:58 INFO | autoserv| use_ssp)
19:30:58 INFO | autoserv| File "/build/squawks/usr/local/build/autotest/server/autoserv", line 346, in run_autoserv
19:30:58 INFO | autoserv| job_folder = job_directories.get_job_folder_name(parser.options.results)
19:30:58 INFO | autoserv| AttributeError: 'module' object has no attribute 'get_job_folder_name'
19:30:58 INFO | autoserv| record_state_duration failed: job_or_task_id=None, hostname=chromeos1-row1-rack3-host6, status=Running
ERROR:root:no test directories found
ERROR:root:no test directories found
19:30:58 ERROR| Autoserv encountered unexpected errors when executing jobs.
19:30:58 INFO | Finished running tests. Results can be found in /tmp/test_that_results_HsQGfr or /tmp/test_that_latest



I ran the test successfully before 'repo sync'