Move those deps/factory/* to site_tests/suite_Factory/.

client/site_tests/factory_ExtDisplay/factory_ExtDisplay.py

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 # DESCRIPTION :
 #
 # This is a factory test to test the external display (hdmi/vga/other)
 # UI based heavily on factory_Display/factory_Audio
 
@@ skipping 129 matching lines @@
         hbox.pack_end(label_en, False, False)
         eb.add(hbox)
         return eb
 
     def register_callbacks(self, window):
         window.connect('key-press-event', self.key_press_callback)
         window.add_events(gtk.gdk.KEY_PRESS_MASK)
         window.connect('key-release-event', self.key_release_callback)
         window.add_events(gtk.gdk.KEY_RELEASE_MASK)
 
-    def locate_asample(self, sample):
-        if not sample:
+    def locate_audio_sample(self, path):
+        if not path:
             raise error.TestFail('ERROR: Must provide an audio sample')
-        if not os.path.isabs(sample):
-            # assume its in deps
-            sample = self.autodir + '/' + sample
-        if not os.path.exists(sample):
-            raise error.TestFail('ERROR: Unable to find audio sample %s' \
-                                     % sample)
-        self._sample=sample
+        if not os.path.isabs(path):
+             # Assume the relative path is based in autotest directory.
+            path = os.path.join(self.autodir, path)
+        if not os.path.exists(path):
+            raise error.TestFail('ERROR: Unable to find audio sample %s' % path)
+        self._sample = path
 
     def run_once(self,
                  has_audio=False,
-                 sample=None):
+                 audio_sample_path=None):
 
         factory.log('%s run_once' % self.__class__)
 
         # Src contains the audio files.
         os.chdir(self.autodir)
 
         self._started = False
 
         if has_audio:
-            self.locate_asample(sample)
+            self.locate_audio_sample(audio_sample_path)
             _SUBTEST_LIST.append(_OPTIONAL)
 
         self._subtest_queue = [x for x in reversed(_SUBTEST_LIST)]
         self._status_map = dict((n, ful.UNTESTED) for n, c in _SUBTEST_LIST)
 
 
         prompt_label = ful.make_label(_LABEL_START_STR, fg=ful.WHITE)
         self._prompt_label = prompt_label
 
         vbox = gtk.VBox()
@@ skipping 11 matching lines @@
         ful.run_test_widget(self.job, vbox,
             window_registration_callback=self.register_callbacks)
 
         failed_set = set(name for name, status in self._status_map.items()
                          if status is not ful.PASSED)
         if failed_set:
             raise error.TestFail('some subtests failed (%s)' %
                                  ', '.join(failed_set))
 
         factory.log('%s run_once finished' % self.__class__)