Fix tests that rely on rootdev specifying a real block device.

client/site_tests/factory_ExternalStorage/factory_ExternalStorage.py

 # -*- coding: utf-8 -*-
 #
 # 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 external SD and USB ports.
@@ skipping 21 matching lines @@
 _TESTING_FMT_STR = lambda t:'testing %s...\n%s 檢查當中...' % (t, t)
 _ERR_TOO_MANY_REMOVE_FMT_STR = \
         lambda target_dev, removed_dev: \
             'Too many device removed (%s). Please only remove %s.\n' \
             '有太多外部儲存裝置被移除 (%s)，請只移除 %s 即可\n' % \
                     (removed_dev, target_dev, removed_dev, target_dev)
 _ERR_DEV_NOT_REMOVE_FMT_STR = \
         lambda t: 'Please remove %s.\n請移除 %s\n' % (t, t)
 
 def find_root_dev():
-    rootdev = utils.system_output('rootdev')
-    return os.path.basename(rootdev[:-1])
+    rootdev = utils.system_output('rootdev -s -d')
+    return os.path.basename(rootdev)
 
 
 def find_all_storage_dev():
     lssys = utils.run('ls -d /sys/block/sd*')
     devices = lssys.stdout.rsplit('\n')
     new_devices = set(os.path.basename(d.rstrip()) for d in devices if d)
     return new_devices
 
 
 class factory_ExternalStorage(test.test):
@@ skipping 93 matching lines @@
         test_widget = gtk.EventBox()
         test_widget.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse('black'))
         test_widget.add(vbox)
 
         ful.run_test_widget(self.job, test_widget)
 
         if self._error:
             raise error.TestFail(self._error)
 
         factory.log('%s run_once finished' % self.__class__)