client/tools/cd_hash.py - Issue 6883246: Merge autotest upstream from @5318 ~ @5336

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: client/tools/cd_hash.py

Issue 6883246: Merge autotest upstream from @5318 ~ @5336 (Closed) Base URL: ssh://gitrw.chromium.org:9222/autotest.git@master

Patch Set: patch Created 9 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: client/tools/cd_hash.py

diff --git a/client/tests/kvm/cd_hash.py b/client/tools/cd_hash.py

old mode 100755

new mode 100644

similarity index 93%

rename from client/tests/kvm/cd_hash.py

rename to client/tools/cd_hash.py

index 04f8cbee33f0bbccd9bca3a8de3a39d5a6b5090e..c658447b800c62ecd45043f7a17846eed4406229

--- a/client/tests/kvm/cd_hash.py

+++ b/client/tools/cd_hash.py

@@ -7,16 +7,16 @@ Program that calculates several hashes for a given CD image.

import os, sys, optparse, logging

import common

-import kvm_utils

from autotest_lib.client.common_lib import logging_manager

from autotest_lib.client.bin import utils

+from autotest_lib.client.virt import virt_utils

if __name__ == "__main__":

parser = optparse.OptionParser("usage: %prog [options] [filenames]")

options, args = parser.parse_args()

- logging_manager.configure_logging(kvm_utils.KvmLoggingConfig())

+ logging_manager.configure_logging(virt_utils.KvmLoggingConfig())

if args:

filenames = args

« no previous file with comments | « client/tests/kvm/unittests.cfg.sample ('k') | client/tools/common.py » ('j') | no next file with comments »